Skip to content

Commit

Permalink
[WIP] Upgrade Karaf from 4.4.6 to 4.4.7
Browse files Browse the repository at this point in the history 
* 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]>
  • Loading branch information
@holgerfriedrich
holgerfriedrich committed Jan 5, 2025
1 parent 0fdbfdb commit c5482a6
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 32 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.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 \
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.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 ^
Expand Down
58 changes: 31 additions & 27 deletions launch/app/app.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,23 @@ feature.openhab-model-runtime-all: \
-runbundles: \
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.18.1,2.18.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.18.1,2.18.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.18.1,2.18.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.1,2.18.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.1,2.18.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.18.1,2.18.2)',\
com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\
com.google.gson;version='[2.10.1,2.10.2)',\
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.jna;version='[5.15.0,5.15.1)',\
<<<<<<< Updated upstream
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
=======
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
>>>>>>> Stashed changes
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)',\
Expand All @@ -158,14 +162,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)',\
Expand Down Expand Up @@ -216,17 +220,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)',\
Expand All @@ -236,7 +240,7 @@ feature.openhab-model-runtime-all: \
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
org.threeten.extra;version='[1.8.0,1.8.1)',\
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
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>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>
Expand Down

0 comments on commit c5482a6

Please sign in to comment.