Skip to content

Commit c7aac59

Browse files
holgerfriedrichholgerfriedrich
authored
Upgrade Karaf to 4.4.9 (#1842)
* Upgrade Karaf to 4.4.9 Upgrade Karaf from 4.4.8 to 4.4.9. This includes upgrades for the following libraries: * asm from 9.8 to 9.9 * classgraph from 4.8.180 to 4.8.184 * commons-io from 2.20.0 to 2.21.0 * commons-lang3 from 3.18.0 to 3.20.0 * cxf from 3.6.8 3.6.9 * guava from 33.4.8-jre to 33.5.0-jre * jackson-annotations from 2.19.2 to 2.20 * jackson from 2.19.2 to 2.20.1 * jna from 5.17.0 to 5.18.1 * ws.xmlschema from 2.3.1 to 2.3.2 * xbean from 4.27 to 4.28 * xtext/xtend from 2.40.0 to 2.41.0.M3 * [windows] Change codepage to 65001 Karaf 4.4.9 has issues drawing table frames on non-UTF8 terminals. apache/karaf#2197 Select a proper UTF8 codepage. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 894a9aa commit c7aac59

4 files changed

Lines changed: 28 additions & 23 deletions

File tree

‎distributions/openhab/src/main/resources/bin/karaf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ run() {
304304
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
305305
--add-reads=java.xml=java.logging \
306306
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
307-
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.8.jar" \
308-
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.8.jar" \
307+
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.9.jar" \
308+
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.9.jar" \
309309
--add-opens java.base/java.security=ALL-UNNAMED \
310310
--add-opens java.base/java.net=ALL-UNNAMED \
311311
--add-opens java.base/java.lang=ALL-UNNAMED \

‎distributions/openhab/src/main/resources/bin/karaf.bat‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ set DIRNAME=%~dp0%
2424
set PROGNAME=%~nx0%
2525
set ARGS=%*
2626

27+
rem enabling workaround for utf8 tables, chcp 65001
28+
rem TODO: remove when upgrading from 4.4.9 to 4.4.10 or 4.5.0
29+
chcp 65001 > nul
30+
rem as this is within the setlocal section, the change will be reverted on exit
31+
2732
rem Sourcing environment settings for karaf similar to tomcats setenv
2833

2934
if "%KARAF_SCRIPT%" == "" (
@@ -412,8 +417,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
412417
"%JAVA%" %JAVA_OPTS% %OPTS% ^
413418
--add-reads=java.xml=java.logging ^
414419
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
415-
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.8.jar" ^
416-
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.8.jar" ^
420+
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.9.jar" ^
421+
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.9.jar" ^
417422
--add-opens java.base/java.security=ALL-UNNAMED ^
418423
--add-opens java.base/java.net=ALL-UNNAMED ^
419424
--add-opens java.base/java.lang=ALL-UNNAMED ^

‎launch/app/app.bndrun‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,20 @@ feature.openhab-model-runtime-all: \
127127
-runbundles: \
128128
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
129129
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\
130-
com.fasterxml.jackson.core.jackson-annotations;version='[2.19.2,2.19.3)',\
131-
com.fasterxml.jackson.core.jackson-core;version='[2.19.2,2.19.3)',\
132-
com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\
133-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\
134-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
135-
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.19.2,2.19.3)',\
130+
com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\
131+
com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\
132+
com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\
133+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\
134+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.2)',\
135+
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.20.1,2.20.2)',\
136136
com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\
137137
com.google.gson;version='[2.13.1,2.13.2)',\
138-
com.google.guava;version='[33.4.8,33.4.9)',\
138+
com.google.guava;version='[33.5.0,33.5.1)',\
139139
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
140140
com.google.inject;version='[7.0.0,7.0.1)',\
141-
com.sun.jna;version='[5.17.0,5.17.1)',\
141+
com.sun.jna;version='[5.18.1,5.18.2)',\
142142
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
143-
io.github.classgraph.classgraph;version='[4.8.180,4.8.181)',\
143+
io.github.classgraph.classgraph;version='[4.8.184,4.8.185)',\
144144
io.methvin.directory-watcher;version='[0.19.1,0.19.2)',\
145145
io.swagger.core.v3.swagger-annotations;version='[2.2.35,2.2.36)',\
146146
io.swagger.core.v3.swagger-core;version='[2.2.35,2.2.36)',\
@@ -177,7 +177,7 @@ feature.openhab-model-runtime-all: \
177177
org.apache.felix.webconsole.plugins.ds;version='[2.2.0,2.2.1)',\
178178
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
179179
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
180-
org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
180+
org.apache.ws.xmlschema.core;version='[2.3.2,2.3.3)',\
181181
org.bitbucket.b_c.jose4j;version='[0.9.6,0.9.7)',\
182182
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
183183
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
@@ -205,16 +205,16 @@ feature.openhab-model-runtime-all: \
205205
org.eclipse.jetty.websocket.server;version='[9.4.57,9.4.58)',\
206206
org.eclipse.jetty.websocket.servlet;version='[9.4.57,9.4.58)',\
207207
org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\
208-
org.eclipse.xtend.lib;version='[2.40.0,2.40.1)',\
209-
org.eclipse.xtend.lib.macro;version='[2.40.0,2.40.1)',\
210-
org.eclipse.xtext;version='[2.40.0,2.40.1)',\
211-
org.eclipse.xtext.common.types;version='[2.40.0,2.40.1)',\
212-
org.eclipse.xtext.util;version='[2.40.0,2.40.1)',\
213-
org.eclipse.xtext.xbase;version='[2.40.0,2.40.1)',\
214-
org.eclipse.xtext.xbase.lib;version='[2.40.0,2.40.1)',\
208+
org.eclipse.xtend.lib;version='[2.41.0,2.41.1)',\
209+
org.eclipse.xtend.lib.macro;version='[2.41.0,2.41.1)',\
210+
org.eclipse.xtext;version='[2.41.0,2.41.1)',\
211+
org.eclipse.xtext.common.types;version='[2.41.0,2.41.1)',\
212+
org.eclipse.xtext.util;version='[2.41.0,2.41.1)',\
213+
org.eclipse.xtext.xbase;version='[2.41.0,2.41.1)',\
214+
org.eclipse.xtext.xbase.lib;version='[2.41.0,2.41.1)',\
215215
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
216216
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
217-
org.objectweb.asm;version='[9.8.0,9.8.1)',\
217+
org.objectweb.asm;version='[9.9.0,9.9.1)',\
218218
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
219219
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
220220
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ohc.version>5.2.0-SNAPSHOT</ohc.version>
6262
<oha.version>5.2.0-SNAPSHOT</oha.version>
6363

64-
<karaf.version>4.4.8</karaf.version>
64+
<karaf.version>4.4.9</karaf.version>
6565

6666
<oh.java.version>21</oh.java.version>
6767
<maven.compiler.release>${oh.java.version}</maven.compiler.release>

0 commit comments

Comments
 (0)