From 69208e95f8aca003a9d404f73c0fd5d48fe5efcb Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Tue, 5 Mar 2024 22:16:12 +0100 Subject: [PATCH] Upgrade to Karaf 4.4.5 For release notes, see: https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12353604&projectId=12311140 Signed-off-by: Holger Friedrich --- .../openhab/src/main/resources/bin/karaf | 4 +- .../openhab/src/main/resources/bin/karaf.bat | 4 +- launch/app/app.bndrun | 98 +++++++++---------- pom.xml | 2 +- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf index 810891b793..34c4f2f552 100755 --- 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.4.jar" \ - --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.4.jar" \ + --patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.5.jar" \ + --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.5.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 index a6ecbf89af..ae536d4d74 100644 --- 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.4.jar" ^ - --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.4.jar" ^ + --patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.5.jar" ^ + --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.5.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 index 0a134f0c37..9258f55e88 100644 --- a/launch/app/app.bndrun +++ b/launch/app/app.bndrun @@ -123,8 +123,6 @@ feature.openhab-model-runtime-all: \ # done # -runbundles: \ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ - org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.3,2.2.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.16.0,2.16.1)',\ @@ -133,14 +131,10 @@ feature.openhab-model-runtime-all: \ com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.16.0,2.16.1)',\ com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[32.1.2,32.1.3)',\ - com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ com.google.inject;version='[7.0.0,7.0.1)',\ - com.sun.jna;version='[5.13.0,5.13.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\ de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\ - io.github.classgraph;version='[4.8.149,4.8.150)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ io.swagger.core.v3.swagger-annotations;version='[2.2.15,2.2.16)',\ io.swagger.core.v3.swagger-core;version='[2.2.15,2.2.16)',\ @@ -155,10 +149,7 @@ feature.openhab-model-runtime-all: \ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\ org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\ - org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\ - org.apache.commons.commons-io;version='[2.13.0,2.13.1)',\ - org.apache.commons.lang3;version='[3.12.0,3.12.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)',\ @@ -178,54 +169,15 @@ feature.openhab-model-runtime-all: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ - org.bitbucket.b_c.jose4j;version='[0.9.3,0.9.4)',\ org.eclipse.emf.common;version='[2.24.0,2.24.1)',\ org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\ org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\ - org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.proxy;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.server;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.websocket.servlet;version='[9.4.52,9.4.53)',\ - org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ - org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\ - org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ 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.5.0,9.5.1)',\ - org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ - org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ @@ -296,4 +248,52 @@ feature.openhab-model-runtime-all: \ org.openhab.core.voice;version='[4.2.0,4.2.1)',\ org.openhab.ui;version='[4.2.0,4.2.1)',\ org.openhab.ui.basic;version='[4.2.0,4.2.1)',\ - org.openhab.ui.iconset.classic;version='[4.2.0,4.2.1)' + org.openhab.ui.iconset.classic;version='[4.2.0,4.2.1)',\ + com.google.guava;version='[33.0.0,33.0.1)',\ + com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ + com.sun.jna;version='[5.14.0,5.14.1)',\ + io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ + org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\ + org.apache.commons.lang3;version='[3.14.0,3.14.1)',\ + org.bitbucket.b_c.jose4j;version='[0.9.5,0.9.6)',\ + org.eclipse.jetty.alpn.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.jaas;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.proxy;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.security;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.util.ajax;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.api;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.client;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.common;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.server;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.websocket.servlet;version='[9.4.53,9.4.54)',\ + org.eclipse.jetty.xml;version='[9.4.53,9.4.54)',\ + org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\ + org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\ + org.objectweb.asm;version='[9.6.0,9.6.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.logging.pax-logging-api;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.6,2.2.7)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.24,8.0.25)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.24,8.0.25)' diff --git a/pom.xml b/pom.xml index eac73030e1..4bddab49ef 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.2.0-SNAPSHOT 4.2.0-SNAPSHOT - 4.4.4 + 4.4.5 17 ${oh.java.version}