Skip to content

Commit faf2a00

Browse files
Upgrade Karaf to 4.4.10 (#1875)
Upgrade Karaf from 4.4.9 to 4.4.10. This includes upgrades for the following libraries: * pax-logging from 2.3.1 to 2.3.2 Move workaround for jline issue in 4.4.9 on Windows platform to karaf.bat to stay in sync with upstream. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 1486531 commit faf2a00

4 files changed

Lines changed: 10 additions & 11 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.9.jar" \
308-
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.9.jar" \
307+
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.10.jar" \
308+
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.10.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ 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
27+
rem cleanly display utf8 tables, chcp 65001
28+
rem this can be removed when fixed in jline
2929
chcp 65001 > nul
3030
rem as this is within the setlocal section, the change will be reverted on exit
3131

@@ -417,8 +417,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
417417
"%JAVA%" %JAVA_OPTS% %OPTS% ^
418418
--add-reads=java.xml=java.logging ^
419419
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
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" ^
420+
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.10.jar" ^
421+
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.10.jar" ^
422422
--add-opens java.base/java.security=ALL-UNNAMED ^
423423
--add-opens java.base/java.net=ALL-UNNAMED ^
424424
--add-opens java.base/java.lang=ALL-UNNAMED ^

launch/app/app.bndrun

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ feature.openhab-model-runtime-all: \
125125
# done
126126
#
127127
-runbundles: \
128-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
129-
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\
128+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
129+
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.2,2.3.3)',\
130130
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
131131
com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\
132132
com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\

pom.xml

Lines changed: 2 additions & 3 deletions
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.9</karaf.version>
64+
<karaf.version>4.4.10</karaf.version>
6565

6666
<oh.java.version>21</oh.java.version>
6767
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
@@ -94,8 +94,7 @@
9494
<plugin>
9595
<groupId>org.apache.karaf.tooling</groupId>
9696
<artifactId>karaf-maven-plugin</artifactId>
97-
<!-- TODO replace fixed version 4.4.8 by ${karaf.tooling.version} one karaf#2219 is contained in future release -->
98-
<version>4.4.8</version>
97+
<version>4.4.10</version>
9998
<extensions>true</extensions>
10099
</plugin>
101100
<plugin>

0 commit comments

Comments
 (0)