Resolve itest runbundles for JUPnP upgrade (#14538)

Related to openhab/openhab-core#3421

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

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index b29335e8f5ba23dae58ea196419e5c8adddc4a5a..0e34554e741e9d422f832e2b210b48dec3f788c5 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -59,7 +59,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.threeten.extra;version='[1.5.0,1.5.1)',\
        com.sun.jna;version='[5.12.1,5.12.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        xstream;version='[1.4.19,1.4.20)',\
        org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
        org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index e3beabcfcc4d60efc9e48b4e8f58e6abcf0cb0c9..492d3e5d093c2b9c235972ee9c439869cbf25539 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -53,5 +53,4 @@ Fragment-Host: org.openhab.binding.astro
        org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
        org.apache.felix.scr;version='[2.2.4,2.2.5)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index fdfce77ef08eec21dcef0ae47ad2adda2f0fc11a..f898540e683c857f52a393dd34d1ad75c0723bf3 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.objenesis;version='[3.2.0,3.2.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-       org.jupnp;version='[2.6.1,2.6.2)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
        biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
@@ -75,5 +74,5 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
        org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)',\
+       org.jupnp;version='[2.7.0,2.7.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index e00a8d7057edcfbdddaf66e97a7dc920b5c39d02..568661953cde883ce634610f7d87f7a35a831863 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -78,5 +78,4 @@ Fragment-Host: org.openhab.binding.hue
        org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 372a4223147c0a345878f1cd4344fef4ebcf7464..bafd22695b15c4ba7a8d0985f156227495f0ef82 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -65,5 +65,4 @@ Fragment-Host: org.openhab.binding.max
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index f7ee85bd7bcb61cb604e9115425deeb7cd5f8642..11f8047470375b7ad8040b81742ea40ce2db184b 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -81,5 +81,4 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\
        org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\
        org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 54fdf53c0cc96da0a549643b37d60b9c56578205..9022cf0ea493df89cb60ec38dc72789a5891d5e6 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.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 9855881f62910b01678fc95da2cbcca82272eacc..22a732016f3b3f655a55ac901883cd5d8f49887b 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -108,5 +108,4 @@ Import-Package: \
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index 410b6b6236bf91ec23bd8c1315ffabb4008615f5..b7e4b6e6f287683d4d1dc5f4f8c9c921e47fefc6 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -108,6 +108,5 @@ Import-Package: \
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'
 

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index f2e466ffb217e821e4aeaea4c9cd1661aae08071..c2ddab2fd58ad5b4bd8861bda6ad129ebb9547f4 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -105,5 +105,4 @@ Fragment-Host: org.openhab.binding.nest
        org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\
        org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\
        org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 6da9fffe1656a4c8387f8116d938a80df0c6ccf3..5533961baf510eae7465b0734cc1e9d2e29f601b 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -69,5 +69,4 @@ Fragment-Host: org.openhab.binding.ntp
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 5faf4388945018c1bf1788a09f955bcc4d13e8dd..ed57cb0ed8069010581d5a1c8f2379fc57be591f 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -72,5 +72,4 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index e8bc5d09e2d5928fd998746777b0d1154053fa27..3ec173b2a74d65294abe9ba9894c9be658adf547 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -76,5 +76,4 @@ Fragment-Host: org.openhab.binding.tradfri
        org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\
        org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
-       org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.component;version='[1.5.0,1.5.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index b88bae9aaeb94935e3f62d0d8d72e4d3fdb617de..c975860e56234ba3799c0859da635f43fc1b45b2 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -43,7 +43,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        xstream;version='[1.4.19,1.4.20)',\
-       org.jupnp;version='[2.6.1,2.6.2)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
        biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
@@ -78,4 +77,4 @@ Fragment-Host: org.openhab.binding.wemo
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\
        org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\
        org.osgi.service.component;version='[1.5.0,1.5.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.jupnp;version='[2.7.0,2.7.1)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index be29ccce7710d740c970ad7f9761430ff4930d3f..ac1b412bd315575693540acd3571efece9a54a1b 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -52,7 +52,6 @@ Fragment-Host: org.openhab.persistence.mapdb
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        xstream;version='[1.4.19,1.4.20)',\
        org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
        org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\