From 1635fbf18b8b611fe29861fc12bfd698d85b9598 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 29 Dec 2018 15:15:18 +0100 Subject: [PATCH] Upgrade Karaf to 4.2.2 Signed-off-by: Wouter Born --- distributions/openhab/pom.xml | 9 ----- .../etc/org.apache.karaf.features.cfg | 32 ++++++++-------- .../openhab/src/main/resources/bin/karaf | 19 ++++++++-- .../openhab/src/main/resources/bin/karaf.bat | 18 +++++++-- .../src/main/resources/runtime/etc/jetty.xml | 3 -- .../resources/userdata/etc/custom.properties | 2 +- .../userdata/etc/org.ops4j.pax.logging.cfg | 5 --- .../userdata/etc/overrides.properties | 1 - features/overrides/pom.xml | 38 ------------------- .../overrides/src/main/feature/feature.xml | 6 --- features/pom.xml | 1 - pom.xml | 4 +- 12 files changed, 48 insertions(+), 90 deletions(-) delete mode 100644 features/overrides/pom.xml delete mode 100644 features/overrides/src/main/feature/feature.xml diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml index 10766bbc44..815431b228 100644 --- a/distributions/openhab/pom.xml +++ b/distributions/openhab/pom.xml @@ -51,14 +51,6 @@ xml runtime - - org.openhab.distro - overrides - ${project.version} - features - xml - runtime - @@ -120,7 +112,6 @@ wrapper wrap - openhab-overrides eventadmin diff --git a/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg b/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg index 8964c157b9..acbeb675de 100644 --- a/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg +++ b/distributions/openhab/src/main/filtered-resources/userdata/etc/org.apache.karaf.features.cfg @@ -30,23 +30,23 @@ featuresRepositories = \ # Comma separated list of features to install at startup # featuresBoot = \ - instance, \ - package, \ - log, \ - ssh, \ - framework, \ - system, \ - eventadmin, \ - feature, \ - shell, \ - service, \ - jaas, \ + instance/${karaf.version}, \ + package/${karaf.version}, \ + log/${karaf.version}, \ + ssh/${karaf.version}, \ + framework/${karaf.version}, \ + system/${karaf.version}, \ + eventadmin/${karaf.version}, \ + feature/${karaf.version}, \ + shell/${karaf.version}, \ + service/${karaf.version}, \ + jaas/${karaf.version}, \ openhab-runtime-base, \ - deployer, \ - diagnostic, \ - bundle, \ - config, \ - kar + deployer/${karaf.version}, \ + diagnostic/${karaf.version}, \ + bundle/${karaf.version}, \ + config/${karaf.version}, \ + kar/${karaf.version} # # Resource repositories (OBR) that the features resolver can use diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf index 8aed279a9b..c99b894e8b 100755 --- a/distributions/openhab/src/main/resources/bin/karaf +++ b/distributions/openhab/src/main/resources/bin/karaf @@ -91,6 +91,16 @@ setupClassPath() { CLASSPATH="${CLASSPATH}:${file}" fi done + if [ "${VERSION}" -gt "8" ] ; then + for file in "${KARAF_HOME}"/lib/jdk9plus/*.jar + do + if [ -z "${CLASSPATH}" ]; then + CLASSPATH="${file}" + else + CLASSPATH="${CLASSPATH}:${file}" + fi + done + fi } checkRootInstance() { @@ -285,8 +295,9 @@ run() { if [ "${VERSION}" -gt "8" ]; then ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \ --add-reads=java.xml=java.logging \ - --patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-4.2.1.jar \ - --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-4.2.1.jar \ + --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \ + --patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-4.2.2.jar \ + --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-4.2.2.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 \ @@ -303,7 +314,7 @@ run() { -Dkaraf.base="${KARAF_BASE}" \ -Dkaraf.data="${KARAF_DATA}" \ -Dkaraf.etc="${KARAF_ETC}" \ - -Dkaraf.logs="${OPENHAB_LOGDIR}" \ + -Dkaraf.log="${OPENHAB_LOGDIR}" \ -Dkaraf.restart.jvm.supported=true \ -Djava.io.tmpdir="${KARAF_DATA}/tmp" \ -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \ @@ -321,7 +332,7 @@ run() { -Dkaraf.base="${KARAF_BASE}" \ -Dkaraf.data="${KARAF_DATA}" \ -Dkaraf.etc="${KARAF_ETC}" \ - -Dkaraf.logs="${OPENHAB_LOGDIR}" \ + -Dkaraf.log="${OPENHAB_LOGDIR}" \ -Dkaraf.restart.jvm.supported=true \ -Djava.io.tmpdir="${KARAF_DATA}/tmp" \ -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \ diff --git a/distributions/openhab/src/main/resources/bin/karaf.bat b/distributions/openhab/src/main/resources/bin/karaf.bat index d7fbfa3d6e..559e2f2f56 100644 --- a/distributions/openhab/src/main/resources/bin/karaf.bat +++ b/distributions/openhab/src/main/resources/bin/karaf.bat @@ -293,6 +293,12 @@ set suffix=%filename:~-4% if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\boot\%filename% goto :EOF +: APPEND_TO_JDK9PLUS_CLASSPATH +set filename=%~1 +set suffix=%filename:~-4% +if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\jdk9plus\%filename% +goto :EOF + :CLASSPATH_END if "%CHECK_ROOT_INSTANCE_RUNNING%" == "" ( @@ -405,10 +411,14 @@ if "%KARAF_PROFILER%" == "" goto :RUN rem If major version is greater than 1 (meaning Java 9 or 10), we don't use endorsed lib but module rem If major version is 1 (meaning Java 1.6, 1.7, 1.8), we use endorsed lib if %JAVA_VERSION% GTR 8 ( + pushd "%KARAF_HOME%\lib\jdk9plus" + for %%G in (*.jar) do call:APPEND_TO_JDK9PLUS_CLASSPATH %%G + popd "%JAVA%" %JAVA_OPTS% %OPTS% ^ --add-reads=java.xml=java.logging ^ - --patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-4.2.1.jar ^ - --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-4.2.1.jar ^ + --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^ + --patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-4.2.2.jar ^ + --patch-module java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-4.2.2.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 ^ @@ -425,7 +435,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN -Dkaraf.home="%KARAF_HOME%" ^ -Dkaraf.base="%KARAF_BASE%" ^ -Dkaraf.etc="%KARAF_ETC%" ^ - -Dkaraf.logs="%OPENHAB_LOGDIR%" ^ + -Dkaraf.log="%OPENHAB_LOGDIR%" ^ -Dkaraf.restart.jvm.supported=true ^ -Djava.io.tmpdir="%KARAF_DATA%\tmp" ^ -Dkaraf.data="%KARAF_DATA%" ^ @@ -440,7 +450,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN -Dkaraf.home="%KARAF_HOME%" ^ -Dkaraf.base="%KARAF_BASE%" ^ -Dkaraf.etc="%KARAF_ETC%" ^ - -Dkaraf.logs="%OPENHAB_LOGDIR%" ^ + -Dkaraf.log="%OPENHAB_LOGDIR%" ^ -Dkaraf.restart.jvm.supported=true ^ -Djava.io.tmpdir="%KARAF_DATA%\tmp" ^ -Dkaraf.data="%KARAF_DATA%" ^ diff --git a/distributions/openhab/src/main/resources/runtime/etc/jetty.xml b/distributions/openhab/src/main/resources/runtime/etc/jetty.xml index f069f6faa5..7d7efb599a 100644 --- a/distributions/openhab/src/main/resources/runtime/etc/jetty.xml +++ b/distributions/openhab/src/main/resources/runtime/etc/jetty.xml @@ -186,9 +186,6 @@ - - - diff --git a/distributions/openhab/src/main/resources/userdata/etc/custom.properties b/distributions/openhab/src/main/resources/userdata/etc/custom.properties index 553fb38596..3705c9278b 100644 --- a/distributions/openhab/src/main/resources/userdata/etc/custom.properties +++ b/distributions/openhab/src/main/resources/userdata/etc/custom.properties @@ -1,4 +1,4 @@ -karaf.bootstrap.log = ${karaf.logs}/openhab.log +karaf.bootstrap.log = ${karaf.log}/openhab.log karaf.systemBundlesStartLevel = 50 karaf.framework = equinox karaf.lock.dir=${karaf.data}/tmp diff --git a/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg b/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg index 393d7fffea..3dbff9f755 100644 --- a/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg +++ b/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg @@ -80,11 +80,6 @@ log4j2.logger.lsp4j.level = OFF log4j2.logger.karservice.name = org.apache.karaf.kar.internal.KarServiceImpl log4j2.logger.karservice.level = ERROR -# Filters warnings about small thread pools. -# The thread pool is kept small intentionally for supporting resource constrained hardware. -log4j2.logger.threadpoolbudget.name = org.eclipse.jetty.util.thread.ThreadPoolBudget -log4j2.logger.threadpoolbudget.level = ERROR - # Appenders configuration diff --git a/distributions/openhab/src/main/resources/userdata/etc/overrides.properties b/distributions/openhab/src/main/resources/userdata/etc/overrides.properties index 08cbc64e53..e69de29bb2 100644 --- a/distributions/openhab/src/main/resources/userdata/etc/overrides.properties +++ b/distributions/openhab/src/main/resources/userdata/etc/overrides.properties @@ -1 +0,0 @@ -mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.2.1-sp1 diff --git a/features/overrides/pom.xml b/features/overrides/pom.xml deleted file mode 100644 index 6428367e3c..0000000000 --- a/features/overrides/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - 4.0.0 - - org.openhab.distro - pom-features - 2.5.0-SNAPSHOT - - overrides - feature - openHAB Overrides - - - - org.apache.karaf.tooling - karaf-maven-plugin - true - - 80 - true - true - true - false - true - true - - - - generate-features-file - generate-resources - - features-generate-descriptor - - - - - - - diff --git a/features/overrides/src/main/feature/feature.xml b/features/overrides/src/main/feature/feature.xml deleted file mode 100644 index ce68840ed7..0000000000 --- a/features/overrides/src/main/feature/feature.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/features/pom.xml b/features/pom.xml index 624dd51f90..dcd7c4fc44 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -19,7 +19,6 @@ distro-kar distro-resources addons - overrides diff --git a/pom.xml b/pom.xml index aa1401b3a5..32b02483fb 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ 1.9.13 - 4.2.1 - 9.4.11.v20180605 + 4.2.2 + 9.4.12.v20180830 org.slf4j