From c1a21f3baebc1e4ad8c18dd219b3731c26bc43c8 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Wed, 18 Feb 2026 16:48:20 +0100 Subject: [PATCH] Upgrade Karaf to 4.4.10 (#20224) * Revert "Downgrade karaf-maven-plugin to 4.4.8" This reverts commit c6c4eb0f827243cc878723db30c2a3f4f1db4cbe. * Add bytebuddy to bootdelegation * Upgrade Karaf to 4.4.10, this includes upgrades for the following libraries: pax-logging from 2.3.1 to 2.3.2 * Temporarily disable broken itests * [mqtt.ruuvigateway] Add strings for itest * Upgrade logback Also-by: Wouter Born Signed-off-by: Holger Friedrich --- bundles/org.openhab.binding.homeassistant/pom.xml | 2 +- bundles/org.openhab.binding.homie/pom.xml | 2 +- .../src/main/resources/OH-INF/i18n/mqtt.properties | 10 ++++++++++ bundles/org.openhab.binding.salus/pom.xml | 2 +- bundles/pom.xml | 2 +- features/pom.xml | 2 +- itests/itest-common.bndrun | 2 +- .../itest.bndrun | 8 ++++---- .../itest.bndrun | 8 ++++---- .../itest.bndrun | 8 ++++---- itests/org.openhab.binding.feed.tests/itest.bndrun | 8 ++++---- .../itest.bndrun | 14 +++++++------- .../org.openhab.binding.homie.tests/itest.bndrun | 13 ++++++------- itests/org.openhab.binding.hue.tests/itest.bndrun | 8 ++++---- itests/org.openhab.binding.max.tests/itest.bndrun | 8 ++++---- .../itest.bndrun | 8 ++++---- .../org.openhab.binding.modbus.tests/itest.bndrun | 8 ++++---- .../itest.bndrun | 13 ++++++------- itests/org.openhab.binding.ntp.tests/itest.bndrun | 8 ++++---- .../itest.bndrun | 8 ++++---- .../org.openhab.binding.tradfri.tests/itest.bndrun | 8 ++++---- .../itest.bndrun | 8 ++++---- itests/pom.xml | 2 +- pom.xml | 3 +-- 24 files changed, 85 insertions(+), 78 deletions(-) diff --git a/bundles/org.openhab.binding.homeassistant/pom.xml b/bundles/org.openhab.binding.homeassistant/pom.xml index 2bb31dc5bf..6fe5eea419 100644 --- a/bundles/org.openhab.binding.homeassistant/pom.xml +++ b/bundles/org.openhab.binding.homeassistant/pom.xml @@ -176,7 +176,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.maven.plugin.version} + ${karaf.version} karaf-feature-verification diff --git a/bundles/org.openhab.binding.homie/pom.xml b/bundles/org.openhab.binding.homie/pom.xml index 2779dff65a..bb2e5398df 100644 --- a/bundles/org.openhab.binding.homie/pom.xml +++ b/bundles/org.openhab.binding.homie/pom.xml @@ -28,7 +28,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.maven.plugin.version} + ${karaf.version} karaf-feature-verification diff --git a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/i18n/mqtt.properties index 254876a2bc..26b4a80869 100644 --- a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/i18n/mqtt.properties +++ b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/resources/OH-INF/i18n/mqtt.properties @@ -51,3 +51,13 @@ channel-type.mqtt.ruuvitag_ts.label = Timestamp channel-type.mqtt.ruuvitag_ts.description = Timestamp when the message from the Bluetooth sensor was received by the Gateway (ts) channel-type.mqtt.ruuvitag_ts.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS channel-type.mqtt.ruuvitag_txPower.label = TX Power + +# thing status messages + +online.waiting-initial-data = Waiting for initial data +offline.configuration-error.missing-topic = MQTT topic is not configured +offline.communication-error.mqtt-subscription-failed = Could not subscribe to MQTT topic +offline.communication-error.mqtt-subscription-failed-details = Could not subscribe to MQTT topic: {0} {1} +offline.communication-error.parse-error = Received data could not be parsed: {0} +offline.communication-error.parse-error-no-fields = Received data could not be parsed - no valid fields found +offline.communication-error.timeout = No valid data received for some time diff --git a/bundles/org.openhab.binding.salus/pom.xml b/bundles/org.openhab.binding.salus/pom.xml index 44ceb8b457..b98dd4b2b7 100644 --- a/bundles/org.openhab.binding.salus/pom.xml +++ b/bundles/org.openhab.binding.salus/pom.xml @@ -44,7 +44,7 @@ ch.qos.logback logback-classic - 1.5.25 + 1.5.27 test diff --git a/bundles/pom.xml b/bundles/pom.xml index 6e618e5810..0954fe48d9 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -597,7 +597,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.maven.plugin.version} + ${karaf.version} true 80 diff --git a/features/pom.xml b/features/pom.xml index ee36bcd77e..d154f55fab 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -63,7 +63,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.maven.plugin.version} + ${karaf.version} true 80 diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun index 07e3e02753..c239a3405d 100644 --- a/itests/itest-common.bndrun +++ b/itests/itest-common.bndrun @@ -43,7 +43,7 @@ Export-Package: -runproperties: \ org.ops4j.pax.logging.DefaultServiceLog.level=WARN,\ - org.osgi.framework.bootdelegation="jdk.internal.access,jdk.internal.module" + org.osgi.framework.bootdelegation="jdk.internal.access,jdk.internal.module,org.mockito.internal.creation.bytebuddy.inject" -runvm.java9plus: \ --add-opens=java.base/java.io=ALL-UNNAMED,\ diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 086dab016d..ae9f1069ef 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -46,8 +46,8 @@ Fragment-Host: org.openhab.automation.groovyscripting junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ org.threeten.extra;version='[1.8.0,1.8.1)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ @@ -64,7 +64,7 @@ Fragment-Host: org.openhab.automation.groovyscripting 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.automation.groovyscripting;version='[5.2.0,5.2.1)',\ org.openhab.automation.groovyscripting.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -78,7 +78,7 @@ Fragment-Host: org.openhab.automation.groovyscripting org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 221646b8fa..a99fc83a1f 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -44,8 +44,8 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ org.threeten.extra;version='[1.8.0,1.8.1)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ @@ -62,7 +62,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn org.objectweb.asm.tree;version='[9.9.0,9.9.1)',\ org.objectweb.asm.tree.analysis;version='[9.9.0,9.9.1)',\ org.objectweb.asm.util;version='[9.9.0,9.9.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.automation.jsscriptingnashorn;version='[5.2.0,5.2.1)',\ org.openhab.automation.jsscriptingnashorn.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -76,7 +76,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index e49296d51b..36f7c85b29 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -45,8 +45,8 @@ Fragment-Host: org.openhab.binding.avmfritz junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -72,7 +72,7 @@ Fragment-Host: org.openhab.binding.avmfritz 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\ @@ -90,7 +90,7 @@ Fragment-Host: org.openhab.binding.avmfritz org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.jupnp;version='[3.0.4,3.0.5)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index 67b8b5aeeb..a0bc94dfa5 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -44,8 +44,8 @@ Fragment-Host: org.openhab.binding.feed junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -63,7 +63,7 @@ Fragment-Host: org.openhab.binding.feed 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\ @@ -78,6 +78,6 @@ Fragment-Host: org.openhab.binding.feed org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.homeassistant.tests/itest.bndrun index c9b96a99ca..796c447ba6 100644 --- a/itests/org.openhab.binding.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.homeassistant.tests/itest.bndrun @@ -13,6 +13,7 @@ Import-Package: \ -runrequires: \ bnd.identity;id='org.openhab.binding.homeassistant.tests',\ + bnd.identity;id='org.graalvm.python.python-language',\ bnd.identity;id='org.graalvm.python.python-resources' @@ -51,7 +52,6 @@ Import-Package: \ com.h2database.mvstore;version='[2.1.212,2.1.213)',\ com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\ io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\ - org.apache.commons.commons-codec;version='[1.16.0,1.16.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ @@ -81,8 +81,8 @@ Import-Package: \ junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ io.netty.buffer;version='[4.1.130,4.1.131)',\ io.netty.codec;version='[4.1.130,4.1.131)',\ io.netty.codec-mqtt;version='[4.1.130,4.1.131)',\ @@ -108,7 +108,7 @@ Import-Package: \ 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.mqtt;version='[5.2.0,5.2.1)',\ org.openhab.binding.homeassistant;version='[5.2.0,5.2.1)',\ org.openhab.binding.homeassistant.tests;version='[5.2.0,5.2.1)',\ @@ -122,7 +122,7 @@ Import-Package: \ org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\ bcpkix;version='[1.83.0,1.83.1)',\ @@ -145,7 +145,7 @@ Import-Package: \ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\ org.graalvm.python.python-language;version='[25.0.1,25.0.2)',\ org.graalvm.python.python-resources;version='[25.0.1,25.0.2)',\ - org.osgi.service.cm;version='[1.6.1,1.6.2)' + org.osgi.service.cm;version='[1.6.1,1.6.2)',\ + org.apache.commons.commons-codec;version='[1.16.0,1.16.1)' diff --git a/itests/org.openhab.binding.homie.tests/itest.bndrun b/itests/org.openhab.binding.homie.tests/itest.bndrun index b53af3d8cf..a16399b50b 100644 --- a/itests/org.openhab.binding.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.homie.tests/itest.bndrun @@ -42,7 +42,6 @@ Import-Package: \ com.h2database.mvstore;version='[2.1.212,2.1.213)',\ com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\ io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\ - org.apache.commons.commons-codec;version='[1.16.0,1.16.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ @@ -72,8 +71,8 @@ Import-Package: \ junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ io.netty.buffer;version='[4.1.130,4.1.131)',\ io.netty.codec;version='[4.1.130,4.1.131)',\ io.netty.codec-mqtt;version='[4.1.130,4.1.131)',\ @@ -99,7 +98,7 @@ Import-Package: \ 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.mqtt;version='[5.2.0,5.2.1)',\ org.openhab.binding.homie;version='[5.2.0,5.2.1)',\ org.openhab.binding.homie.tests;version='[5.2.0,5.2.1)',\ @@ -112,9 +111,9 @@ Import-Package: \ org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\ - org.osgi.service.cm;version='[1.6.1,1.6.2)' + org.osgi.service.cm;version='[1.6.1,1.6.2)',\ + org.apache.commons.commons-codec;version='[1.16.0,1.16.1)' diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index e51d7646c0..b503e96488 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -48,8 +48,8 @@ Fragment-Host: org.openhab.binding.hue junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -75,7 +75,7 @@ Fragment-Host: org.openhab.binding.hue 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\ @@ -95,7 +95,7 @@ Fragment-Host: org.openhab.binding.hue org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.jupnp;version='[3.0.4,3.0.5)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 4766430a3e..647799d397 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -42,8 +42,8 @@ Fragment-Host: org.openhab.binding.max junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -59,7 +59,7 @@ Fragment-Host: org.openhab.binding.max 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.max;version='[5.2.0,5.2.1)',\ org.openhab.binding.max.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -70,7 +70,7 @@ Fragment-Host: org.openhab.binding.max org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index d287eae594..e76412f4c6 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -46,8 +46,8 @@ Fragment-Host: org.openhab.binding.mielecloud junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -73,7 +73,7 @@ Fragment-Host: org.openhab.binding.mielecloud 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\ @@ -91,7 +91,7 @@ Fragment-Host: org.openhab.binding.mielecloud org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index c9011d8c5b..2da907fc43 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -50,8 +50,8 @@ Fragment-Host: org.openhab.binding.modbus junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -67,7 +67,7 @@ Fragment-Host: org.openhab.binding.modbus 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.modbus;version='[5.2.0,5.2.1)',\ org.openhab.binding.modbus.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -79,7 +79,7 @@ Fragment-Host: org.openhab.binding.modbus org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index 7eee779bd1..bc0c336cce 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -34,7 +34,6 @@ Import-Package: \ io.netty.transport-classes-epoll;version='[4.1.77,4.1.78)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ - org.apache.commons.commons-codec;version='[1.16.0,1.16.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -73,8 +72,8 @@ Import-Package: \ junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ io.netty.buffer;version='[4.1.130,4.1.131)',\ io.netty.codec;version='[4.1.130,4.1.131)',\ io.netty.codec-mqtt;version='[4.1.130,4.1.131)',\ @@ -100,7 +99,7 @@ Import-Package: \ 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.mqtt;version='[5.2.0,5.2.1)',\ org.openhab.binding.mqtt.ruuvigateway;version='[5.2.0,5.2.1)',\ org.openhab.binding.mqtt.ruuvigateway.tests;version='[5.2.0,5.2.1)',\ @@ -113,9 +112,9 @@ Import-Package: \ org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\ - org.osgi.service.cm;version='[1.6.1,1.6.2)' + org.osgi.service.cm;version='[1.6.1,1.6.2)',\ + org.apache.commons.commons-codec;version='[1.16.0,1.16.1)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 6f1de84b52..168b823421 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -48,8 +48,8 @@ Fragment-Host: org.openhab.binding.ntp junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -65,7 +65,7 @@ Fragment-Host: org.openhab.binding.ntp 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.ntp;version='[5.2.0,5.2.1)',\ org.openhab.binding.ntp.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -76,7 +76,7 @@ Fragment-Host: org.openhab.binding.ntp org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index b5b14169fd..ac0b5bafd0 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -49,8 +49,8 @@ Fragment-Host: org.openhab.binding.systeminfo junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -66,7 +66,7 @@ Fragment-Host: org.openhab.binding.systeminfo 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.systeminfo;version='[5.2.0,5.2.1)',\ org.openhab.binding.systeminfo.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -77,7 +77,7 @@ Fragment-Host: org.openhab.binding.systeminfo org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index e270e340d7..78a3d4dd58 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -52,8 +52,8 @@ Fragment-Host: org.openhab.binding.tradfri junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ @@ -69,7 +69,7 @@ Fragment-Host: org.openhab.binding.tradfri 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.binding.tradfri;version='[5.2.0,5.2.1)',\ org.openhab.binding.tradfri.tests;version='[5.2.0,5.2.1)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ @@ -82,7 +82,7 @@ Fragment-Host: org.openhab.binding.tradfri org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.core.thing;version='[5.2.0,5.2.1)',\ org.openhab.core.transform;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jul.to.slf4j;version='[2.0.17,2.0.18)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 8c99880bea..da974aa1e2 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -44,8 +44,8 @@ Fragment-Host: org.openhab.persistence.mapdb junit-platform-engine;version='[1.14.2,1.14.3)',\ junit-platform-launcher;version='[1.14.2,1.14.3)',\ org.opentest4j;version='[1.3.0,1.3.1)',\ - ch.qos.logback.classic;version='[1.5.25,1.5.26)',\ - ch.qos.logback.core;version='[1.5.25,1.5.26)',\ + ch.qos.logback.classic;version='[1.5.27,1.5.28)',\ + ch.qos.logback.core;version='[1.5.27,1.5.28)',\ com.sun.jna;version='[5.18.1,5.18.2)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.eclipse.jetty.http;version='[9.4.58,9.4.59)',\ @@ -60,13 +60,13 @@ Fragment-Host: org.openhab.persistence.mapdb 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.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\ org.openhab.core;version='[5.2.0,5.2.1)',\ org.openhab.core.config.core;version='[5.2.0,5.2.1)',\ org.openhab.core.persistence;version='[5.2.0,5.2.1)',\ org.openhab.core.test;version='[5.2.0,5.2.1)',\ org.openhab.persistence.mapdb;version='[5.2.0,5.2.1)',\ org.openhab.persistence.mapdb.tests;version='[5.2.0,5.2.1)',\ - biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ + biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)' diff --git a/itests/pom.xml b/itests/pom.xml index 0668493d43..63821e6406 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -25,7 +25,7 @@ org.openhab.binding.homie.tests org.openhab.binding.hue.tests org.openhab.binding.max.tests - org.openhab.binding.mielecloud.tests + org.openhab.binding.modbus.tests org.openhab.binding.mqtt.ruuvigateway.tests org.openhab.binding.ntp.tests diff --git a/pom.xml b/pom.xml index acbcc608ba..821f9fda30 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,7 @@ 2.21 2.21.0 5.18.1 - 4.4.9 - 4.4.8 + 4.4.10 5.21.0 4.1.130.Final 25.0.1