From 1329f708d35e5e630aae4dcd3e1436bbc414baa1 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 27 Jan 2024 15:35:59 +0100 Subject: [PATCH] Resolve runbundles for jUPnP upgrade Related to openhab/openhab-core#4098 Signed-off-by: Wouter Born --- .../itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- .../org.openhab.binding.astro.tests/itest.bndrun | 3 ++- .../itest.bndrun | 11 +++++++++-- itests/org.openhab.binding.feed.tests/itest.bndrun | 3 ++- itests/org.openhab.binding.hue.tests/itest.bndrun | 11 +++++++++-- itests/org.openhab.binding.max.tests/itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- .../org.openhab.binding.modbus.tests/itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- itests/org.openhab.binding.ntp.tests/itest.bndrun | 3 ++- .../itest.bndrun | 3 ++- .../org.openhab.binding.tradfri.tests/itest.bndrun | 3 ++- itests/org.openhab.binding.wemo.tests/itest.bndrun | 14 ++++++++++++-- itests/org.openhab.binding.wemo.tests/pom.xml | 6 ++++++ 17 files changed, 62 insertions(+), 19 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 796915b59557e..e8e10fe89c074 100644 --- 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 d84e706983cb7..b4e22e11a6f04 100644 --- 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 fd75ec861e5d3..94326d38ed3e8 100644 --- 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 51cf753623b1b..ae1814c00e585 100644 --- 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 141409a09e84d..25413ecb057b4 100644 --- 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 5cc607338eb55..16e4d4ce97931 100644 --- 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 1c493e8e569e5..882562b65dc19 100644 --- 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 7f953480c2a04..12ebb6d6e3915 100644 --- 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 8512b8ac30b84..b06efee1f6d5c 100644 --- 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 3975f190a0626..fd6781a7c54cf 100644 --- 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 2a924fb3216c3..e85a760dd1817 100644 --- 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 ff929535cdf96..6d9b113a0ef01 100644 --- 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 da55eade6d793..31881d95d8849 100644 --- 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 6a62514c63ade..f5ac5ca0521a0 100644 --- 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 a8b714ac95be2..abcbe61b0a17f 100644 --- 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 f6d6966c4af39..47873231ad26e 100644 --- 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 b5b614d76ecb7..9f5561a745b37 100644 --- a/itests/org.openhab.binding.wemo.tests/pom.xml +++ b/itests/org.openhab.binding.wemo.tests/pom.xml @@ -15,6 +15,12 @@ openHAB Add-ons :: Integration Tests :: Wemo Binding Tests + + org.jupnp + org.jupnp + 3.0.0 + tests + org.openhab.addons.bundles org.openhab.binding.wemo