Resolve itest runbundles (#15139)

With openhab/openhab-core#3355 the dependencies changed.

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 6addffe64c01db198e633ab3144a6efe9a27fe36..1e8b72e7657cc79800d9346ff9c05e736549ec75 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -77,5 +77,4 @@ Fragment-Host: org.openhab.automation.groovyscripting
        junit-platform-commons;version='[1.9.2,1.9.3)',\
        junit-platform-engine;version='[1.9.2,1.9.3)',\
        junit-platform-launcher;version='[1.9.2,1.9.3)',\
-       xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       xstream;version='[1.4.20,1.4.21)'

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 12f3cbd4341ecb929166841ebb458394fc8cc190..c5d1057ce899ead90b372dd6c54d3d083273d05f 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -71,5 +71,4 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        junit-platform-commons;version='[1.9.2,1.9.3)',\
        junit-platform-engine;version='[1.9.2,1.9.3)',\
        junit-platform-launcher;version='[1.9.2,1.9.3)',\
-       xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       xstream;version='[1.4.20,1.4.21)'

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 000c68b3e3d7d102051f02c3ce16fa787fc262a6..ce906543bfc7dcd9f99425eac955cc8b2ddeae53 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -54,4 +54,4 @@ Fragment-Host: org.openhab.binding.astro
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index d2a5a0406871e1aba16f4449008ef1baab4eb0ac..b643b35d1fd1c86003759bb2258be7d450727f37 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -80,4 +80,4 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index b12690320245ea8eac069b6d49a5d5fcc34ba898..587fb1af12289279537b9c91db6ce1ebcfb76f43 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -72,4 +72,5 @@ Fragment-Host: org.openhab.binding.feed
        junit-platform-commons;version='[1.9.2,1.9.3)',\
        junit-platform-engine;version='[1.9.2,1.9.3)',\
        junit-platform-launcher;version='[1.9.2,1.9.3)',\
-       xstream;version='[1.4.20,1.4.21)'
+       xstream;version='[1.4.20,1.4.21)',\
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 54bc468c22492c8c8b7fa567a46f08abd4f58e49..21b327d536ca512364245672b32df18b07c0361b 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -86,4 +86,4 @@ Fragment-Host: org.openhab.binding.hue
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 0a06ea113f0c1f05db4c7d86f30499c128a6ce7d..02f6e9864e3d82d6f83e861432373d46d325ea05 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -66,4 +66,4 @@ Fragment-Host: org.openhab.binding.max
        junit-platform-engine;version='[1.9.2,1.9.3)',\
        junit-platform-launcher;version='[1.9.2,1.9.3)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index c42f3e8da15ccfe4b819fd3bd434aee6191f1d4d..20148f6abf993632ae0b7b7e7641f2c421826d95 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -86,4 +86,4 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index b2f27e8011daf0cb2b927203e808d735bc765fb3..a55f2e1919d57315699dbc257cfd31265b31ebfb 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -74,5 +74,4 @@ Fragment-Host: org.openhab.binding.modbus
        org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
-       xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       xstream;version='[1.4.20,1.4.21)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 10f6abfdbd2b676fbf9ef3c6f43d7dbd22509961..82e05021ef7cfa8a3690f54a32c317b9c6776e38 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -98,7 +98,6 @@ Import-Package: \
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        io.netty.buffer;version='[4.1.92,4.1.93)',\
        io.netty.codec;version='[4.1.92,4.1.93)',\
        io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
@@ -108,5 +107,4 @@ Import-Package: \
        io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
        io.netty.resolver;version='[4.1.92,4.1.93)',\
        io.netty.transport;version='[4.1.92,4.1.93)',\
-       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
+       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index fdb054c1567930f4b637e9ea2ff8bf45cefb8e64..cb2781f5c78285771b61b7efa8a09a08f15517e3 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -98,7 +98,6 @@ Import-Package: \
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        io.netty.buffer;version='[4.1.92,4.1.93)',\
        io.netty.codec;version='[4.1.92,4.1.93)',\
        io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
@@ -108,6 +107,5 @@ Import-Package: \
        io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
        io.netty.resolver;version='[4.1.92,4.1.93)',\
        io.netty.transport;version='[4.1.92,4.1.93)',\
-       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
+       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'
 

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index d943fe38b3b75348234533a4b79d675d912f38dc..2e565f2a58310543cccccde7032b635ffe7fae69 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -110,4 +110,4 @@ Fragment-Host: org.openhab.binding.nest
        org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
        org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
        org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 46ee33f90d256b68a56c316c5f3fadcbde16774f..778ecbdba41328cc8c2ac580ea8ac3e39d03d2ab 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -70,4 +70,4 @@ Fragment-Host: org.openhab.binding.ntp
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 2ecbb06ae1d1743c5ec0c97969c3bb521fe58558..727b85b0aec569daabe49280bb25a69cce64f8e1 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -73,4 +73,4 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 2302fd9b88bd44fbbd86702c2e3185b6da656853..c41296d1f736264ef9dbbe65c33e2934a848fafb 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -77,4 +77,4 @@ Fragment-Host: org.openhab.binding.tradfri
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 8904e23905596a966e394a232561c1fe353604b8..cece3bdf774147d908008c2cd1d0ef6f95ef93eb 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -82,4 +82,4 @@ Fragment-Host: org.openhab.binding.wemo
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
        xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.0.0,4.0.1)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 17743b204c55087b13259079935d4022546fcb9e..78704eef742396a3b3484d066fca48cf940b69c5 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -64,5 +64,4 @@ Fragment-Host: org.openhab.persistence.mapdb
        junit-platform-commons;version='[1.9.2,1.9.3)',\
        junit-platform-engine;version='[1.9.2,1.9.3)',\
        junit-platform-launcher;version='[1.9.2,1.9.3)',\
-       xstream;version='[1.4.20,1.4.21)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       xstream;version='[1.4.20,1.4.21)'