diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml index 4c648b6ded..af5640c329 100644 --- a/distributions/openhab/pom.xml +++ b/distributions/openhab/pom.xml @@ -116,7 +116,6 @@ eventadmin - ${basedir}/processing.xml jaas shell diff --git a/distributions/openhab/processing.xml b/distributions/openhab/processing.xml deleted file mode 100644 index 820bed0c23..0000000000 --- a/distributions/openhab/processing.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/distributions/openhab/src/main/descriptors/archive.xml b/distributions/openhab/src/main/descriptors/archive.xml index a92221f1bd..5abe575253 100644 --- a/distributions/openhab/src/main/descriptors/archive.xml +++ b/distributions/openhab/src/main/descriptors/archive.xml @@ -51,9 +51,6 @@ system/** bin/*.lst - - system/org/ops4j/pax/logging/*/2.0.12/** - 0644 diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf index 78c9075d80..fc32e5a535 100755 --- a/distributions/openhab/src/main/resources/bin/karaf +++ b/distributions/openhab/src/main/resources/bin/karaf @@ -301,8 +301,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.3.4.jar" \ - --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.4.jar" \ + --patch-module "java.base=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.3.6.jar" \ + --patch-module "java.xml=${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.6.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 \ diff --git a/distributions/openhab/src/main/resources/bin/karaf.bat b/distributions/openhab/src/main/resources/bin/karaf.bat index 8c2aec9d34..c438f21469 100644 --- a/distributions/openhab/src/main/resources/bin/karaf.bat +++ b/distributions/openhab/src/main/resources/bin/karaf.bat @@ -407,8 +407,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.3.4.jar" ^ - --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.4.jar" ^ + --patch-module "java.base=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.locator-4.3.6.jar" ^ + --patch-module "java.xml=%KARAF_HOME%/lib/endorsed/org.apache.karaf.specs.java.xml-4.3.6.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 ^ diff --git a/launch/app/.classpath b/launch/app/.classpath index 234db15be4..4559ca0b25 100644 --- a/launch/app/.classpath +++ b/launch/app/.classpath @@ -6,11 +6,6 @@ - - - - - diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun index dcbfe241d0..5ba37c00c3 100644 --- a/launch/app/app.bndrun +++ b/launch/app/app.bndrun @@ -116,8 +116,8 @@ feature.openhab-model-runtime-all: \ # done # -runbundles: \ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ - org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ + org.ops4j.pax.logging.pax-logging-log4j2;version='[2.0.14,2.0.15)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.12.5,2.12.6)',\ com.fasterxml.jackson.core.jackson-core;version='[2.12.5,2.12.6)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.12.5,2.12.6)',\ @@ -170,8 +170,8 @@ feature.openhab-model-runtime-all: \ org.apache.servicemix.specs.jaxb-api-2.3;version='[2.3.0,2.3.1)',\ org.apache.servicemix.specs.stax-api-1.0;version='[2.9.0,2.9.1)',\ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\ - org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\ - org.apache.xbean.finder;version='[4.19.0,4.19.1)',\ + org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ + org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ org.bitbucket.b_c.jose4j;version='[0.7.7,0.7.8)',\ org.eclipse.emf.common;version='[2.17.0,2.17.1)',\ org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\ diff --git a/pom.xml b/pom.xml index 7d22b2c0a8..21996e57d4 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.3.0-SNAPSHOT 3.3.0-SNAPSHOT - 4.3.4 + 4.3.6 11 ${oh.java.version}