Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Karaf 4.4.5 #1637

Merged
merged 5 commits into from
Mar 17, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Upgrade to Karaf 4.4.5
holgerfriedrich committed Mar 5, 2024

Verified

This commit was signed with the committer’s verified signature.
commit 69208e95f8aca003a9d404f73c0fd5d48fe5efcb
4 changes: 2 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf
Original file line number Diff line number Diff line change
@@ -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 \
4 changes: 2 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf.bat
Original file line number Diff line number Diff line change
@@ -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 ^
98 changes: 49 additions & 49 deletions launch/app/app.bndrun
Original file line number Diff line number Diff line change
@@ -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)',\
Comment on lines -126 to -127
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC the Pax Logging bundles are at the top so those bundles are started first so the log levels are applied immediately which prevents noisy debug/trace logging at startup.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have a look. I was thought not to touch whatever the resolver creates ;-)

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)',\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always keep the bundles sorted as sometimes the bundle order causes very slow bundle resolution, see: https://community.openhab.org/t/starting-demo-app-takes-ages-10-12min-on-every-run-osgi-startup/122083

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)'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -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>