Skip to content

Commit 981f13c

Browse files
holgerfriedrichwborn
holgerfriedrich
authored and
wborn
committed
Upgrade Karaf from 4.4.6 to 4.4.7
* Sync runtime dependencies with Karaf 4.4.7, most notably: * PaxWeb 8.0.30 * Jetty 9.4.57.v20241219 * BouncyCastle 1.78.1 * CXF 3.6.4 * JNA 5.15.0 * JAXB 2.3.9 * commons-io 2.17.0 * commons-lang3 3.17.0 * PaxLogging 2.2.8 * Upgrade missed ASM dependencies to 9.7.1 Signed-off-by: Holger Friedrich <[email protected]>
1 parent 7a36f07 commit 981f13c

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎distributions/openhab/src/main/resources/bin/karaf

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ run() {
304304
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
305305
--add-reads=java.xml=java.logging \
306306
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
307-
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.6.jar" \
308-
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.6.jar" \
307+
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.7.jar" \
308+
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.7.jar" \
309309
--add-opens java.base/java.security=ALL-UNNAMED \
310310
--add-opens java.base/java.net=ALL-UNNAMED \
311311
--add-opens java.base/java.lang=ALL-UNNAMED \

‎distributions/openhab/src/main/resources/bin/karaf.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
412412
"%JAVA%" %JAVA_OPTS% %OPTS% ^
413413
--add-reads=java.xml=java.logging ^
414414
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
415-
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.6.jar" ^
416-
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.6.jar" ^
415+
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.7.jar" ^
416+
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.7.jar" ^
417417
--add-opens java.base/java.security=ALL-UNNAMED ^
418418
--add-opens java.base/java.net=ALL-UNNAMED ^
419419
--add-opens java.base/java.lang=ALL-UNNAMED ^

‎launch/app/app.bndrun

+50-50
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,21 @@ feature.openhab-model-runtime-all: \
124124
# done
125125
#
126126
-runbundles: \
127-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
128-
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
129-
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
130-
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
131-
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
132-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
133-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
134-
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.17.1,2.17.2)',\
127+
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
128+
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\
129+
com.fasterxml.jackson.core.jackson-annotations;version='[2.18.1,2.18.2)',\
130+
com.fasterxml.jackson.core.jackson-core;version='[2.18.1,2.18.2)',\
131+
com.fasterxml.jackson.core.jackson-databind;version='[2.18.1,2.18.2)',\
132+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.1,2.18.2)',\
133+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.1,2.18.2)',\
134+
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.18.1,2.18.2)',\
135135
com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\
136136
com.google.gson;version='[2.10.1,2.10.2)',\
137137
com.google.guava;version='[33.3.0,33.3.1)',\
138138
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
139139
com.google.inject;version='[7.0.0,7.0.1)',\
140-
com.sun.jna;version='[5.14.0,5.14.1)',\
141-
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
140+
com.sun.jna;version='[5.15.0,5.15.1)',\
141+
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
142142
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
143143
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
144144
io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
@@ -158,14 +158,14 @@ feature.openhab-model-runtime-all: \
158158
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
159159
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
160160
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
161-
org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\
162-
org.apache.commons.lang3;version='[3.14.0,3.14.1)',\
163-
org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\
164-
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\
165-
org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\
166-
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\
167-
org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\
168-
org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\
161+
org.apache.commons.commons-io;version='[2.17.0,2.17.1)',\
162+
org.apache.commons.lang3;version='[3.17.0,3.17.1)',\
163+
org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\
164+
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\
165+
org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\
166+
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.4,3.6.5)',\
167+
org.apache.cxf.cxf-rt-security;version='[3.6.4,3.6.5)',\
168+
org.apache.cxf.cxf-rt-transports-http;version='[3.6.4,3.6.5)',\
169169
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
170170
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
171171
org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
@@ -186,26 +186,26 @@ feature.openhab-model-runtime-all: \
186186
org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
187187
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
188188
org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
189-
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
190-
org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
191-
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
192-
org.eclipse.jetty.http2.client;version='[9.4.54,9.4.55)',\
193-
org.eclipse.jetty.http2.common;version='[9.4.54,9.4.55)',\
194-
org.eclipse.jetty.http2.hpack;version='[9.4.54,9.4.55)',\
195-
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
196-
org.eclipse.jetty.jaas;version='[9.4.54,9.4.55)',\
197-
org.eclipse.jetty.proxy;version='[9.4.54,9.4.55)',\
198-
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
199-
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
200-
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
201-
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
202-
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
203-
org.eclipse.jetty.websocket.api;version='[9.4.54,9.4.55)',\
204-
org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
205-
org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
206-
org.eclipse.jetty.websocket.server;version='[9.4.54,9.4.55)',\
207-
org.eclipse.jetty.websocket.servlet;version='[9.4.54,9.4.55)',\
208-
org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
189+
org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\
190+
org.eclipse.jetty.client;version='[9.4.57,9.4.58)',\
191+
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
192+
org.eclipse.jetty.http2.client;version='[9.4.57,9.4.58)',\
193+
org.eclipse.jetty.http2.common;version='[9.4.57,9.4.58)',\
194+
org.eclipse.jetty.http2.hpack;version='[9.4.57,9.4.58)',\
195+
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
196+
org.eclipse.jetty.jaas;version='[9.4.57,9.4.58)',\
197+
org.eclipse.jetty.proxy;version='[9.4.57,9.4.58)',\
198+
org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\
199+
org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\
200+
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
201+
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
202+
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
203+
org.eclipse.jetty.websocket.api;version='[9.4.57,9.4.58)',\
204+
org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\
205+
org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\
206+
org.eclipse.jetty.websocket.server;version='[9.4.57,9.4.58)',\
207+
org.eclipse.jetty.websocket.servlet;version='[9.4.57,9.4.58)',\
208+
org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\
209209
org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\
210210
org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\
211211
org.eclipse.xtext;version='[2.36.0,2.36.1)',\
@@ -216,17 +216,17 @@ feature.openhab-model-runtime-all: \
216216
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
217217
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
218218
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
219-
org.objectweb.asm;version='[9.7.0,9.7.1)',\
220-
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
221-
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
222-
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
223-
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
224-
org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
225-
org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.27,8.0.28)',\
226-
org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
227-
org.ops4j.pax.web.pax-web-runtime;version='[8.0.27,8.0.28)',\
228-
org.ops4j.pax.web.pax-web-spi;version='[8.0.27,8.0.28)',\
229-
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.27,8.0.28)',\
219+
org.objectweb.asm;version='[9.7.1,9.7.2)',\
220+
org.objectweb.asm.commons;version='[9.7.1,9.7.2)',\
221+
org.objectweb.asm.tree;version='[9.7.1,9.7.2)',\
222+
org.objectweb.asm.tree.analysis;version='[9.7.1,9.7.2)',\
223+
org.objectweb.asm.util;version='[9.7.1,9.7.2)',\
224+
org.ops4j.pax.web.pax-web-api;version='[8.0.30,8.0.31)',\
225+
org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.30,8.0.31)',\
226+
org.ops4j.pax.web.pax-web-jetty;version='[8.0.30,8.0.31)',\
227+
org.ops4j.pax.web.pax-web-runtime;version='[8.0.30,8.0.31)',\
228+
org.ops4j.pax.web.pax-web-spi;version='[8.0.30,8.0.31)',\
229+
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.30,8.0.31)',\
230230
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
231231
org.osgi.service.component;version='[1.5.1,1.5.2)',\
232232
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
@@ -236,7 +236,7 @@ feature.openhab-model-runtime-all: \
236236
org.osgi.util.function;version='[1.2.0,1.2.1)',\
237237
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
238238
org.threeten.extra;version='[1.8.0,1.8.1)',\
239-
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
239+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
240240
si-units;version='[2.1.0,2.1.1)',\
241241
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
242242
stax2-api;version='[4.2.2,4.2.3)',\

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ohc.version>5.0.0-SNAPSHOT</ohc.version>
6262
<oha.version>5.0.0-SNAPSHOT</oha.version>
6363

64-
<karaf.version>4.4.6</karaf.version>
64+
<karaf.version>4.4.7</karaf.version>
6565

6666
<oh.java.version>21</oh.java.version>
6767
<maven.compiler.release>${oh.java.version}</maven.compiler.release>

0 commit comments

Comments
 (0)