Resolve itests after core changes (#15454)

Signed-off-by: Jan N. Klug <github@klug.nrw>

diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 92113b57ae88e2dcee7438ba33b0384fe0a18259..f98498fdc2ba8a8f331d86cb178027efc8326997 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -28,10 +28,8 @@ Fragment-Host: org.openhab.automation.groovyscripting
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        jakarta.annotation-api;version='[1.3.5,1.3.6)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        jollyday;version='[0.5.10,0.5.11)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
@@ -47,8 +45,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.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.felix.scr;version='[2.2.4,2.2.5)',\
@@ -79,4 +75,8 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 463fb724a10fd78df59564e273297061ca6a6c8c..ffc4418d1508f252bb818092e66fcb9532c98b5d 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -24,13 +24,9 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -73,4 +69,8 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index d08683e7f612002de99e16eb251adb003b357217..cf375405b15f20866fac939f011ab6764948ecba 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -16,13 +16,9 @@ Fragment-Host: org.openhab.binding.astro
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -56,4 +52,8 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 59c3867bc68987396da011b8999ce6c24a9c6a76..ed64801acf75de1fa0d8f9865e09786528ffd716 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -21,13 +21,9 @@ Fragment-Host: org.openhab.binding.avmfritz
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -82,4 +78,8 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index dad472181edc34e50208cf669455c566ba407f38..e6eca23ed2c35da54a3e2e14f90422a28180e917 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -24,13 +24,9 @@ Fragment-Host: org.openhab.binding.feed
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -74,4 +70,8 @@ Fragment-Host: org.openhab.binding.feed
        org.openhab.core.test;version='[4.1.0,4.1.1)',\
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
-       org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+       org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 832f2a372e9361aa219a00ead976fa71485064f2..d3143c3afd2dc79685daa45d9afd26bc16bcdd50 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -23,13 +23,9 @@ Fragment-Host: org.openhab.binding.hue
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -88,4 +84,8 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 38ced4da4dbe6ff76c2e7f7800a801237b91ceb7..32eee8c180975315f318c39e872610ab040cbcdd 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -23,13 +23,9 @@ Fragment-Host: org.openhab.binding.max
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index 711af5555e69d590e49588f381bf03131a3749d3..d1a3568951c9dca614879c4903cc2c2d7c30de4e 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -22,13 +22,9 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.opentest4j;version='[1.2.0,1.2.1)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -88,4 +84,8 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index e7316c0d4e96be3b2b78223377f189b5dde41567..9c96ce8b7dfbc40d4ac13973bf24c834a693c14c 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -24,13 +24,9 @@ Fragment-Host: org.openhab.binding.modbus
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -76,4 +72,8 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 2610328ac04fc5121061038cacc6ef1f1b29b9f9..e606ffbf7845df638e232fd08473bb7641864b61 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -40,9 +40,7 @@ Import-Package: \
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
@@ -51,8 +49,6 @@ Import-Package: \
        org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        com.h2database.mvstore;version='[1.4.199,1.4.200)',\
        com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
        io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
@@ -109,4 +105,9 @@ Import-Package: \
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index c6d1adb7e50f9d56f7fb675b7aed457cf7b9fa1b..0436dd588740d7540f139c20ca7eb681c6a58619 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -40,9 +40,7 @@ Import-Package: \
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
@@ -51,8 +49,6 @@ Import-Package: \
        org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        com.h2database.mvstore;version='[1.4.199,1.4.200)',\
        com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
        io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
@@ -109,5 +105,10 @@ Import-Package: \
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.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 888e44184756411e44015b881b7801805e26099a..8b58c66dfe5d2ead061e34d55372968d472f1f4e 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -41,10 +41,8 @@ Import-Package: \
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        junit-jupiter-api;version='[5.9.2,5.9.3)',\
        junit-jupiter-engine;version='[5.9.2,5.9.3)',\
        junit-jupiter-params;version='[5.9.2,5.9.3)',\
@@ -79,8 +77,6 @@ Import-Package: \
        org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        xstream;version='[1.4.20,1.4.21)',\
        io.netty.buffer;version='[4.1.92,4.1.93)',\
        io.netty.codec;version='[4.1.92,4.1.93)',\
@@ -110,4 +106,9 @@ Import-Package: \
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 7233db97667b2651bbb66a6dd4663848d08ebf41..dac35b1068a59f8426f646750a9e23b877771c84 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -31,12 +31,8 @@ Fragment-Host: org.openhab.binding.nest
        org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
        org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
        stax2-api;version='[4.2.1,4.2.2)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\
        org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.5,3.4.6)',\
        org.apache.cxf.cxf-rt-rs-client;version='[3.4.5,3.4.6)',\
@@ -112,4 +108,8 @@ Fragment-Host: org.openhab.binding.nest
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 2012310d91286c5e98eb2c7ea8f970711e4f4217..886eb8700fbf5e1882242e714dd4cea8c7c23aab 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -22,13 +22,9 @@ Fragment-Host: org.openhab.binding.ntp
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -72,4 +68,8 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 7cb1b52c5f5c1b4e25e8d96511a7bdedd1255876..0064834bf3d4b200cfd94e1afbce71f22f77f73c 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -24,13 +24,9 @@ Fragment-Host: org.openhab.binding.systeminfo
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        com.sun.jna;version='[5.12.1,5.12.2)',\
        com.sun.jna.platform;version='[5.12.1,5.12.2)',\
        si-units;version='[2.1.0,2.1.1)',\
@@ -75,4 +71,8 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 7401a3b31e3aa3b7266c8ae977a8de3aac03c88b..76b5a08a54a2a1aa5dfc84dbb4fe1ba41ee6a1b9 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -23,13 +23,9 @@ Fragment-Host: org.openhab.binding.tradfri
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -79,4 +75,8 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 0b803160ef02035227cfedeee585fcd831764e30..66b273cc0e15445fae8f5b258d9aeca7fb15f420 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -22,13 +22,9 @@ Fragment-Host: org.openhab.binding.wemo
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -84,4 +80,8 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.thing;version='[4.1.0,4.1.1)',\
        org.openhab.core.transform;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index e5e1bf1d507b85499a4788d74ac4bace4d7f4f6b..dd971ca51d689101b380e5f178a8d0f01e468814 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -24,13 +24,9 @@ Fragment-Host: org.openhab.persistence.mapdb
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
-       tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -66,4 +62,8 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.openhab.persistence.mapdb;version='[4.1.0,4.1.1)',\
        org.openhab.persistence.mapdb.tests;version='[4.1.0,4.1.1)',\
        org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+       org.apiguardian.api;version='[1.1.2,1.1.3)',\
+       tech.units.indriya;version='[2.2.0,2.2.1)',\
+       uom-lib-common;version='[2.2.0,2.2.1)'