Upgrade to Karaf 4.3.3 (#1315)

* Syncs distro customizations with Karaf 4.3.3 * Resolves app runbundles for the new dependencies See also: * Release notes: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12349968 * Blog post: http://nanthrax.blogspot.com/2021/09/whats-new-in-apache-karaf-runtime-433.html Signed-off-by: Wouter Born <[email protected]>
openhab · Sep 18, 2021 · 6434c59 · 6434c59
1 parent 34aee9a
commit 6434c59
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 45 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.2.jar" \
-                    --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.2.jar" \
+                    --patch-module "java.base=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.3.3.jar" \
+                    --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.3.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 \
@@ -322,7 +322,8 @@ run() {
                     --add-exports=java.base/sun.net.www.content.text=ALL-UNNAMED \
                     --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED \
                     --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \
-                    --add-exports java.security.sasl/com.sun.security.sasl=ALL-UNNAMED \
+                    --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED \
+                    --add-exports=java.security.sasl/com.sun.security.sasl=ALL-UNNAMED \
                     -Dkaraf.instances="${KARAF_DATA}/tmp/instances" \
                     -Dkaraf.home="${KARAF_HOME}" \
                     -Dkaraf.base="${KARAF_BASE}" \

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.2.jar" ^
-                --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.2.jar" ^
+                --patch-module "java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-4.3.3.jar" ^
+                --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.3.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 ^
@@ -428,7 +428,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
                 --add-exports=java.base/sun.net.www.content.text=ALL-UNNAMED ^
                 --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED ^
                 --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED ^
-                --add-exports java.security.sasl/com.sun.security.sasl=ALL-UNNAMED ^
+                --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED ^
+                --add-exports=java.security.sasl/com.sun.security.sasl=ALL-UNNAMED ^
                 -classpath "%CLASSPATH%" ^
                 -Dkaraf.instances="%OPENHAB_USERDATA%\tmp\instances" ^
                 -Dkaraf.home="%KARAF_HOME%" ^

diff --git a/distributions/openhab/src/main/resources/userdata/etc/org.apache.karaf.jaas.cfg b/distributions/openhab/src/main/resources/userdata/etc/org.apache.karaf.jaas.cfg
@@ -13,12 +13,8 @@ encryption.suffix = {CRYPT}
 #
 # Set the encryption algorithm to use in Karaf JAAS login module
 # Supported encryption algorithms follow:
-#   MD2
-#   MD5
-#   SHA-1
-#   SHA-256
-#   SHA-384
-#   SHA-512
+#   basic/jasypt: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
+#   spring-security-crypto: argon2, bcrypt, pbkdf2, scrypt
 #
 encryption.algorithm = SHA-256
 
@@ -41,9 +37,12 @@ encryption.enabled = true
 
 #
 # Encryption Service name
-#   the default one is 'basic'
-#   a more powerful one named 'jasypt' is available
-#       when installing the encryption feature
+#   basic: the default encryption service which digests passwords without
+#          salting them
+#   jasypt: a more powerful alternative which supports salting
+#   spring-security-crypto: Supports bcrypt, argon2, pbkdf2, scrypt. Requires
+#                           the "spring-security-crypto-encryption" feature
+#                           to be installed.
 #
 encryption.name = basic
 
diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
@@ -115,8 +115,8 @@ feature.openhab-model-runtime-all: \
 # done
 #
 -runbundles: \
-	org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.9,2.0.10)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.10,2.0.11)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.12.3,2.12.4)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.12.3,2.12.4)',\
 	com.fasterxml.jackson.core.jackson-databind;version='[2.12.3,2.12.4)',\
@@ -146,8 +146,8 @@ feature.openhab-model-runtime-all: \
 	org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
 	org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.2,1.3.3)',\
-	org.apache.commons.fileupload;version='[1.3.3,1.3.4)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
+	org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
+	org.apache.commons.io;version='[1.4.0,1.4.1)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
 	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
@@ -156,14 +156,14 @@ feature.openhab-model-runtime-all: \
 	org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
 	org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
-	org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\
-	org.apache.felix.gogo.runtime;version='[1.0.10,1.0.11)',\
-	org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
+	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.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.0.4,1.0.5)',\
-	org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-	org.apache.felix.webconsole;version='[4.3.4,4.3.5)',\
-	org.apache.felix.webconsole.plugins.ds;version='[2.0.8,2.0.9)',\
+	org.apache.felix.inventory;version='[1.1.0,1.1.1)',\
+	org.apache.felix.scr;version='[2.1.28,2.1.29)',\
+	org.apache.felix.webconsole;version='[4.7.0,4.7.1)',\
+	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)',\
@@ -178,19 +178,19 @@ feature.openhab-model-runtime-all: \
 	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.40,9.4.41)',\
-	org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.proxy;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.40,9.4.41)',\
-	org.eclipse.jetty.xml;version='[9.4.40,9.4.41)',\
+	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.xtend.lib;version='[2.25.0,2.25.1)',\
 	org.eclipse.xtend.lib.macro;version='[2.25.0,2.25.1)',\
 	org.eclipse.xtext;version='[2.25.0,2.25.1)',\
@@ -206,11 +206,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.16,7.3.17)',\
-	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[7.3.16,7.3.17)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.3.16,7.3.17)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.3.16,7.3.17)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.3.16,7.3.17)',\
+	org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
+	org.ops4j.pax.web.pax-web-extender-whiteboard;version='[7.3.19,7.3.20)',\
+	org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
+	org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
+	org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
 	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.2.0-SNAPSHOT</ohc.version>
         <oha.version>3.2.0-SNAPSHOT</oha.version>
 
-        <karaf.version>4.3.2</karaf.version>
+        <karaf.version>4.3.3</karaf.version>
 
         <oh.java.version>11</oh.java.version>
         <maven.compiler.source>${oh.java.version}</maven.compiler.source>