diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf index 4764277e6..e8deb6569 100755 --- a/distributions/openhab/src/main/resources/bin/karaf +++ b/distributions/openhab/src/main/resources/bin/karaf @@ -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.6.jar" \ - --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.6.jar" \ + --patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.7.jar" \ + --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.7.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 712b7ba7f..07534cbc2 100644 --- a/distributions/openhab/src/main/resources/bin/karaf.bat +++ b/distributions/openhab/src/main/resources/bin/karaf.bat @@ -412,8 +412,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.6.jar" ^ - --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.6.jar" ^ + --patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.7.jar" ^ + --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.7.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/app.bndrun b/launch/app/app.bndrun index 2d1c6a2c5..858471f8b 100644 --- a/launch/app/app.bndrun +++ b/launch/app/app.bndrun @@ -124,24 +124,24 @@ feature.openhab-model-runtime-all: \ # done # -runbundles: \ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\ - org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\ - com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\ - com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.17.1,2.17.2)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\ + org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\ + com.fasterxml.jackson.core.jackson-annotations;version='[2.18.1,2.18.2)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.18.1,2.18.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.18.1,2.18.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.1,2.18.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.1,2.18.2)',\ + com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.18.1,2.18.2)',\ com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[33.3.0,33.3.1)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ + com.google.guava;version='[33.3.1,33.3.2)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ - com.sun.jna;version='[5.14.0,5.14.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + com.sun.jna;version='[5.15.0,5.15.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\ - io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ + io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ io.swagger.core.v3.swagger-annotations;version='[2.2.15,2.2.16)',\ io.swagger.core.v3.swagger-core;version='[2.2.15,2.2.16)',\ @@ -158,14 +158,14 @@ feature.openhab-model-runtime-all: \ org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\ - org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\ - org.apache.commons.lang3;version='[3.14.0,3.14.1)',\ - org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\ + org.apache.commons.commons-io;version='[2.17.0,2.17.1)',\ + org.apache.commons.lang3;version='[3.17.0,3.17.1)',\ + org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-rs-sse;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-security;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-transports-http;version='[3.6.4,3.6.5)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\ org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\ @@ -186,47 +186,47 @@ feature.openhab-model-runtime-all: \ org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\ - org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.http2.client;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.http2.common;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.jaas;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.proxy;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.websocket.api;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.websocket.server;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.websocket.servlet;version='[9.4.54,9.4.55)',\ - org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\ - org.eclipse.xtend.lib;version='[2.36.0,2.36.1)',\ - org.eclipse.xtend.lib.macro;version='[2.36.0,2.36.1)',\ - org.eclipse.xtext;version='[2.36.0,2.36.1)',\ - org.eclipse.xtext.common.types;version='[2.36.0,2.36.1)',\ - org.eclipse.xtext.util;version='[2.36.0,2.36.1)',\ - org.eclipse.xtext.xbase;version='[2.36.0,2.36.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.36.0,2.36.1)',\ + org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.client;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.http2.client;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.http2.common;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.jaas;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.proxy;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.websocket.api;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\ + org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\ + 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.37.0,2.37.1)',\ + org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\ + org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ - org.objectweb.asm;version='[9.7.0,9.7.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)',\ - org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\ - org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.27,8.0.28)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.27,8.0.28)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.27,8.0.28)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.27,8.0.28)',\ + org.objectweb.asm;version='[9.7.1,9.7.2)',\ + org.objectweb.asm.commons;version='[9.7.1,9.7.2)',\ + org.objectweb.asm.tree;version='[9.7.1,9.7.2)',\ + org.objectweb.asm.tree.analysis;version='[9.7.1,9.7.2)',\ + org.objectweb.asm.util;version='[9.7.1,9.7.2)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.30,8.0.31)',\ + org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.30,8.0.31)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.30,8.0.31)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.30,8.0.31)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.30,8.0.31)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.30,8.0.31)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ @@ -236,7 +236,7 @@ feature.openhab-model-runtime-all: \ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ org.threeten.extra;version='[1.8.0,1.8.1)',\ - org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\ + org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ diff --git a/pom.xml b/pom.xml index 68e2644c1..3c2def7e8 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 5.0.0-SNAPSHOT 5.0.0-SNAPSHOT - 4.4.6 + 4.4.7 21 ${oh.java.version}