Upgrade to Karaf 4.3.7 (#1389)

* Syncs distro customizations with Karaf 4.3.7 * Resolves app runbundles for the new dependencies For release notes, see: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12351181 This fixes warnings when starting the runtime with Java 17 (#1316). Signed-off-by: Wouter Born <[email protected]>
openhab · Apr 28, 2022 · 54bde88 · 54bde88
1 parent ed053ef
commit 54bde88
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf
@@ -301,8 +301,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.3.6.jar" \
-                    --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.6.jar" \
+                    --patch-module "java.base=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.3.7.jar" \
+                    --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.7.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
@@ -407,8 +407,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.3.6.jar" ^
-                --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.6.jar" ^
+                --patch-module "java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-4.3.7.jar" ^
+                --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.7.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
@@ -117,13 +117,13 @@ feature.openhab-model-runtime-all: \
 # done
 #
 -runbundles: \
-	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.14,2.0.15)',\
-	com.fasterxml.jackson.core.jackson-annotations;version='[2.12.5,2.12.6)',\
-	com.fasterxml.jackson.core.jackson-core;version='[2.12.5,2.12.6)',\
-	com.fasterxml.jackson.core.jackson-databind;version='[2.12.5,2.12.6)',\
-	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.12.5,2.12.6)',\
-	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.12.5,2.12.6)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.16,2.0.17)',\
+	com.fasterxml.jackson.core.jackson-annotations;version='[2.12.6,2.12.7)',\
+	com.fasterxml.jackson.core.jackson-core;version='[2.12.6,2.12.7)',\
+	com.fasterxml.jackson.core.jackson-databind;version='[2.12.6,2.12.7)',\
+	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.12.6,2.12.7)',\
+	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.12.6,2.12.7)',\
 	com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
 	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
@@ -157,42 +157,42 @@ feature.openhab-model-runtime-all: \
 	org.apache.cxf.cxf-rt-rs-sse;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-security;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)',\
-	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
-	org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
+	org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\
 	org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.inventory;version='[1.1.0,1.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-	org.apache.felix.webconsole;version='[4.7.0,4.7.1)',\
+	org.apache.felix.webconsole;version='[4.7.2,4.7.3)',\
 	org.apache.felix.webconsole.plugins.ds;version='[2.1.0,2.1.1)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.3;version='[2.3.0,2.3.1)',\
 	org.apache.servicemix.specs.stax-api-1.0;version='[2.9.0,2.9.1)',\
 	org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
-	org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\
-	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
+	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
+	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
 	org.bitbucket.b_c.jose4j;version='[0.7.7,0.7.8)',\
 	org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
 	org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
-	org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.proxy;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
-	org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\
+	org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.proxy;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
+	org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\
 	org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext;version='[2.26.0,2.26.1)',\
@@ -208,11 +208,11 @@ feature.openhab-model-runtime-all: \
 	org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.0.0,9.0.1)',\
 	org.objectweb.asm.util;version='[9.0.0,9.0.1)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
-	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[7.3.23,7.3.24)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\
+	org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
+	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[7.3.25,7.3.26)',\
+	org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
+	org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\
+	org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
 	org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
         <ohc.version>3.3.0-SNAPSHOT</ohc.version>
         <oha.version>3.3.0-SNAPSHOT</oha.version>
 
-        <karaf.version>4.3.6</karaf.version>
+        <karaf.version>4.3.7</karaf.version>
 
         <oh.java.version>11</oh.java.version>
         <maven.compiler.source>${oh.java.version}</maven.compiler.source>