Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf
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.8.jar" \
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.8.jar" \
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.9.jar" \
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.9.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
9 changes: 7 additions & 2 deletions distributions/openhab/src/main/resources/bin/karaf.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ set DIRNAME=%~dp0%
set PROGNAME=%~nx0%
set ARGS=%*

rem enabling workaround for utf8 tables, chcp 65001
rem TODO: remove when upgrading from 4.4.9 to 4.4.10 or 4.5.0
chcp 65001 > nul
rem as this is within the setlocal section, the change will be reverted on exit

rem Sourcing environment settings for karaf similar to tomcats setenv

if "%KARAF_SCRIPT%" == "" (
Expand Down Expand Up @@ -412,8 +417,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.8.jar" ^
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.8.jar" ^
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.9.jar" ^
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.9.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
36 changes: 18 additions & 18 deletions launch/app/app.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ feature.openhab-model-runtime-all: \
-runbundles: \
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.19.2,2.19.3)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\
com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.20.1,2.20.2)',\
com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\
com.google.gson;version='[2.13.1,2.13.2)',\
com.google.guava;version='[33.4.8,33.4.9)',\
com.google.guava;version='[33.5.0,33.5.1)',\
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
com.google.inject;version='[7.0.0,7.0.1)',\
com.sun.jna;version='[5.17.0,5.17.1)',\
com.sun.jna;version='[5.18.1,5.18.2)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\
io.github.classgraph.classgraph;version='[4.8.184,4.8.185)',\
io.methvin.directory-watcher;version='[0.19.1,0.19.2)',\
io.swagger.core.v3.swagger-annotations;version='[2.2.35,2.2.36)',\
io.swagger.core.v3.swagger-core;version='[2.2.35,2.2.36)',\
Expand Down Expand Up @@ -177,7 +177,7 @@ feature.openhab-model-runtime-all: \
org.apache.felix.webconsole.plugins.ds;version='[2.2.0,2.2.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.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
org.apache.ws.xmlschema.core;version='[2.3.2,2.3.3)',\
org.bitbucket.b_c.jose4j;version='[0.9.6,0.9.7)',\
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
Expand Down Expand Up @@ -205,16 +205,16 @@ feature.openhab-model-runtime-all: \
org.eclipse.jetty.websocket.server;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.websocket.servlet;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\
org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\
org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\
org.eclipse.xtext;version='[2.40.0,2.40.1)',\
org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\
org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\
org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\
org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\
org.eclipse.xtend.lib;version='[2.41.0,2.41.1)',\
org.eclipse.xtend.lib.macro;version='[2.41.0,2.41.1)',\
org.eclipse.xtext;version='[2.41.0,2.41.1)',\
org.eclipse.xtext.common.types;version='[2.41.0,2.41.1)',\
org.eclipse.xtext.util;version='[2.41.0,2.41.1)',\
org.eclipse.xtext.xbase;version='[2.41.0,2.41.1)',\
org.eclipse.xtext.xbase.lib;version='[2.41.0,2.41.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
org.objectweb.asm;version='[9.8.0,9.8.1)',\
org.objectweb.asm;version='[9.9.0,9.9.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)',\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ohc.version>5.2.0-SNAPSHOT</ohc.version>
<oha.version>5.2.0-SNAPSHOT</oha.version>

<karaf.version>4.4.8</karaf.version>
<karaf.version>4.4.9</karaf.version>

<oh.java.version>21</oh.java.version>
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
Expand Down