Skip to content

Commit

Permalink
Upgrade to Karaf 4.4.5 (openhab#1637)
Browse files Browse the repository at this point in the history 
For release notes, see:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12353604&projectId=12311140

Signed-off-by: Holger Friedrich <[email protected]>
  • Loading branch information
@holgerfriedrich
holgerfriedrich authored Mar 17, 2024
1 parent 609a34c commit d39aa87
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
4 changes: 2 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^
Expand Down
2 changes: 1 addition & 1 deletion launch/ModelGen.launch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="-DskipChecks -DskipTests clean install -am -pl bundles/org.openhab.core.model.core -pl bundles/org.openhab.core.model.item -pl bundles/org.openhab.core.model.item.ide -pl bundles/org.openhab.core.model.lazygen -pl bundles/org.openhab.core.model.persistence -pl bundles/org.openhab.core.model.persistence.ide -pl bundles/org.openhab.core.model.rule -pl bundles/org.openhab.core.model.rule.ide -pl bundles/org.openhab.core.model.script -pl bundles/org.openhab.core.model.script.ide -pl bundles/org.openhab.core.model.sitemap -pl bundles/org.openhab.core.model.sitemap.ide -pl bundles/org.openhab.core.model.thing -pl bundles/org.openhab.core.model.thing.ide"/>
<stringAttribute key="M2_GOALS" value="-DskipChecks -DskipTests clean install -am -pl bundles/org.openhab.core.model.core -pl bundles/org.openhab.core.model.item -pl bundles/org.openhab.core.model.item.ide -pl bundles/org.openhab.core.model.persistence -pl bundles/org.openhab.core.model.persistence.ide -pl bundles/org.openhab.core.model.rule -pl bundles/org.openhab.core.model.rule.ide -pl bundles/org.openhab.core.model.script -pl bundles/org.openhab.core.model.script.ide -pl bundles/org.openhab.core.model.sitemap -pl bundles/org.openhab.core.model.sitemap.ide -pl bundles/org.openhab.core.model.thing -pl bundles/org.openhab.core.model.thing.ide"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
Expand Down
96 changes: 48 additions & 48 deletions launch/app/app.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ 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)',\
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)',\
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)',\
Expand All @@ -133,14 +133,14 @@ 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.guava;version='[33.0.0,33.0.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.13.0,5.13.1)',\
com.sun.jna;version='[5.14.0,5.14.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.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\
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)',\
Expand All @@ -155,10 +155,10 @@ 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.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.13.0,2.13.1)',\
org.apache.commons.lang3;version='[3.12.0,3.12.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)',\
Expand All @@ -178,54 +178,54 @@ 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.bitbucket.b_c.jose4j;version='[0.9.5,0.9.6)',\
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.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.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.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.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)'\,
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)',\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ohc.version>4.2.0-SNAPSHOT</ohc.version>
<oha.version>4.2.0-SNAPSHOT</oha.version>

<karaf.version>4.4.4</karaf.version>
<karaf.version>4.4.5</karaf.version>

<oh.java.version>17</oh.java.version>
<maven.compiler.source>${oh.java.version}</maven.compiler.source>
Expand Down

0 comments on commit d39aa87

Please sign in to comment.