[WIP] Upgrade Karaf from 4.4.6 to 4.4.7

* Sync runtime dependencies with Karaf 4.4.7, most notably: * PaxWeb 8.0.29 * 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 * Upgrade missed ASM dependencies to 9.7.1 Signed-off-by: Holger Friedrich <[email protected]>
openhab · Dec 23, 2024 · de72b42 · de72b42
1 parent a0b33ed
commit de72b42
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf
@@ -304,8 +304,8 @@ run() {
                 ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
                     --add-reads=java.xml=java.logging \
                     --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
-                    --patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.6.jar" \
-                    --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.6.jar" \
+                    --patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.7-SNAPSHOT.jar" \
+                    --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.7-SNAPSHOT.jar" \
                     --add-opens java.base/java.security=ALL-UNNAMED \
                     --add-opens java.base/java.net=ALL-UNNAMED \
                     --add-opens java.base/java.lang=ALL-UNNAMED \

diff --git a/distributions/openhab/src/main/resources/bin/karaf.bat b/distributions/openhab/src/main/resources/bin/karaf.bat
@@ -412,8 +412,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
             "%JAVA%" %JAVA_OPTS% %OPTS% ^
                 --add-reads=java.xml=java.logging ^
                 --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
-                --patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.6.jar" ^
-                --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.6.jar" ^
+                --patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.7-SNAPSHOT.jar" ^
+                --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.7-SNAPSHOT.jar" ^
                 --add-opens java.base/java.security=ALL-UNNAMED ^
                 --add-opens java.base/java.net=ALL-UNNAMED ^
                 --add-opens java.base/java.lang=ALL-UNNAMED ^

diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
@@ -136,8 +136,8 @@ feature.openhab-model-runtime-all: \
 	com.google.guava;version='[33.3.0,33.3.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.google.inject;version='[7.0.0,7.0.1)',\
-	com.sun.jna;version='[5.14.0,5.14.1)',\
-	com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
+	com.sun.jna;version='[5.15.0,5.15.1)',\
+	com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
 	de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
 	de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\
 	io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\
@@ -157,14 +157,14 @@ feature.openhab-model-runtime-all: \
 	org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
 	org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
-	org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\
-	org.apache.commons.lang3;version='[3.14.0,3.14.1)',\
-	org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\
-	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\
-	org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\
-	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\
-	org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\
-	org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\
+	org.apache.commons.commons-io;version='[2.17.0,2.17.1)',\
+	org.apache.commons.lang3;version='[3.17.0,3.17.1)',\
+	org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-rt-security;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-rt-transports-http;version='[3.6.4,3.6.5)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
 	org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
@@ -215,17 +215,17 @@ feature.openhab-model-runtime-all: \
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
-	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
-	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
-	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-spi;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.27,8.0.28)',\
+	org.objectweb.asm;version='[9.7.1,9.7.2)',\
+	org.objectweb.asm.commons;version='[9.7.1,9.7.2)',\
+	org.objectweb.asm.tree;version='[9.7.1,9.7.2)',\
+	org.objectweb.asm.tree.analysis;version='[9.7.1,9.7.2)',\
+	org.objectweb.asm.util;version='[9.7.1,9.7.2)',\
+	org.ops4j.pax.web.pax-web-api;version='[8.0.29,8.0.30)',\
+	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.29,8.0.30)',\
+	org.ops4j.pax.web.pax-web-jetty;version='[8.0.29,8.0.30)',\
+	org.ops4j.pax.web.pax-web-runtime;version='[8.0.29,8.0.30)',\
+	org.ops4j.pax.web.pax-web-spi;version='[8.0.29,8.0.30)',\
+	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.29,8.0.30)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\

diff --git a/pom.xml b/pom.xml
@@ -61,7 +61,7 @@
     <ohc.version>5.0.0-SNAPSHOT</ohc.version>
     <oha.version>5.0.0-SNAPSHOT</oha.version>
 
-    <karaf.version>4.4.6</karaf.version>
+    <karaf.version>4.4.7-SNAPSHOT</karaf.version>
 
     <oh.java.version>21</oh.java.version>
     <maven.compiler.release>${oh.java.version}</maven.compiler.release>