Resolve runbundles for jUPnP upgrade (#16423)

Related to openhab/openhab-core#4098

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 796915b59557e987d5ed5d5745f0cbd9abad6862..e8e10fe89c0741b400fe9c7b2eca84f0bcd03c13 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -88,4 +88,5 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.threeten.extra;version='[1.7.2,1.7.3)',\
        stax2-api;version='[4.2.1,4.2.2)',\
        de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\
-       de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)'
+       de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index d84e706983cb74e8756128b68f1a8a4ac366e235..b4e22e11a6f04774cdc2eee68d1b630094717b3a 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -85,4 +85,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.threeten.extra;version='[1.7.2,1.7.3)',\
        stax2-api;version='[4.2.1,4.2.2)',\
        de.focus_shift.jollyday-core;version='[0.23.2,0.23.3)',\
-       de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)'
+       de.focus_shift.jollyday-jackson;version='[0.23.2,0.23.3)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index fd75ec861e5d365b097de1e1f04f10c73d9b54d2..94326d38ed3e8b2688f8119706ee75d4ea2fc5f2 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -56,4 +56,5 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.storage.json;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 51cf753623b1b35232cc75dec4821396127db8c3..ae1814c00e585f6119ee71d74815a94fc462d742 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        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.0,1.5.1)',\
-       org.jupnp;version='[2.7.1,2.7.2)',\
        net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
        net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
@@ -88,4 +87,12 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
+       org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
+       org.jupnp;version='[3.0.0,3.0.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)',\
+       org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 141409a09e84d67e1792c036b933ca750c0e0030..25413ecb057b4df3210dbb21250537dd5d34ac47 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -81,4 +81,5 @@ Fragment-Host: org.openhab.binding.feed
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 5cc607338eb55ba0e97342aaad604f346673ec32..16e4d4ce979315d548c8b84b35a396147ba83230 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.hue
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
        javax.jmdns;version='[3.5.9,3.5.10)',\
-       org.jupnp;version='[2.7.1,2.7.2)',\
        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.0,1.5.1)',\
@@ -94,4 +93,12 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
+       org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
+       org.jupnp;version='[3.0.0,3.0.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)',\
+       org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 1c493e8e569e5f1b9c15e89a8dfc72bf7f5ce0b8..882562b65dc19ce738c803b38cc50529f35298b3 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -74,4 +74,5 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index 7f953480c2a04446945773ca4288b628c1634163..12ebb6d6e39151c63925fb089053c9495304305d 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -94,4 +94,5 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 8512b8ac30b84c452bc33d2bc0ada2c9b448e08f..b06efee1f6d5cc97e892c53f56cab576aca3226e 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -82,4 +82,5 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.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 3975f190a06265d1e4cff91834237edba2c82c75..fd6781a7c54cf1bfbebf5da03e174296866052b6 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -115,4 +115,5 @@ Import-Package: \
        io.netty.resolver;version='[4.1.104,4.1.105)',\
        io.netty.transport;version='[4.1.104,4.1.105)',\
        io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.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 2a924fb3216c31ecfc3dc34afaddecd2ae2152fd..e85a760dd181750efcbd08c13d07eff25b10b1ec 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -115,5 +115,6 @@ Import-Package: \
        io.netty.resolver;version='[4.1.104,4.1.105)',\
        io.netty.transport;version='[4.1.104,4.1.105)',\
        io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.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 ff929535cdf968c4d77d5871086e687efb37e525..6d9b113a0ef0177b2e56ef8ceb594eea8ea8480e 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -116,4 +116,5 @@ Import-Package: \
        io.netty.resolver;version='[4.1.104,4.1.105)',\
        io.netty.transport;version='[4.1.104,4.1.105)',\
        io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index da55eade6d7936c2042beb12486150d6eff83e54..31881d95d8849bd238e47aae2e9ce2d95ba2c316 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -78,4 +78,5 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 6a62514c63adee2118c3fb1fb23c94d44103c9ce..f5ac5ca0521a025b34d25f71ecd9fa34d3cce803 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -81,4 +81,5 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index a8b714ac95be2913d2ad7f85f576b7a33f2ceba8..abcbe61b0a17f3ba67afab222328f15bdb3ee16b 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -85,4 +85,5 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index f6d6966c4af3990fd85ce111ada1a413ac7d05c0..47873231ad26ec9b8199b39dc869926576b730bc 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -3,6 +3,9 @@
 Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.wemo
 
+-includeresource: \
+       @org.jupnp-*-tests.jar!/org/jupnp/mock/*
+
 -runrequires: \
        bnd.identity;id='org.openhab.binding.wemo.tests'
 
@@ -27,7 +30,6 @@ Fragment-Host: org.openhab.binding.wemo
        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.0,1.5.1)',\
-       org.jupnp;version='[2.7.1,2.7.2)',\
        net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
        net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
@@ -90,4 +92,12 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'
+       org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+       org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\
+       org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
+       org.jupnp;version='[3.0.0,3.0.1)',\
+       org.openhab.core.addon;version='[4.2.0,4.2.1)',\
+       org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
+       org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)'

diff --git a/itests/org.openhab.binding.wemo.tests/pom.xml b/itests/org.openhab.binding.wemo.tests/pom.xml
index b5b614d76ecb79d10bdbe0f2ee9b4a0ed8e55de1..9f5561a745b37b38a1837deca35222331427facc 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/pom.xml
+++ b/itests/org.openhab.binding.wemo.tests/pom.xml
@@ -15,6 +15,12 @@
   <name>openHAB Add-ons :: Integration Tests :: Wemo Binding Tests</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp</artifactId>
+      <version>3.0.0</version>
+      <classifier>tests</classifier>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.wemo</artifactId>