From c7f7dbdc0719b9855b0ad8faa9a779d218d31a94 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 5 Mar 2023 13:12:49 +0100 Subject: [PATCH] Resolve itest runbundles for JUPnP upgrade (#14538) Related to openhab/openhab-core#3421 Signed-off-by: Wouter Born --- .../itest.bndrun | 1 - itests/org.openhab.binding.astro.tests/itest.bndrun | 1 - itests/org.openhab.binding.avmfritz.tests/itest.bndrun | 5 ++--- itests/org.openhab.binding.hue.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.max.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.mielecloud.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.modbus.tests/itest.bndrun | 3 +-- .../itest.bndrun | 3 +-- itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.nest.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.ntp.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.systeminfo.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.tradfri.tests/itest.bndrun | 3 +-- itests/org.openhab.binding.wemo.tests/itest.bndrun | 3 +-- itests/org.openhab.persistence.mapdb.tests/itest.bndrun | 1 - 15 files changed, 13 insertions(+), 28 deletions(-) diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index b29335e8f5b..0e34554e741 100644 --- 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 e3beabcfcc4..492d3e5d093 100644 --- 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 fdfce77ef08..f898540e683 100644 --- 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 e00a8d7057e..568661953cd 100644 --- 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 372a4223147..bafd22695b1 100644 --- 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 f7ee85bd7bc..11f80474703 100644 --- 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 54fdf53c0cc..9022cf0ea49 100644 --- 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 9855881f629..22a732016f3 100644 --- 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 410b6b6236b..b7e4b6e6f28 100644 --- 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 f2e466ffb21..c2ddab2fd58 100644 --- 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 6da9fffe165..5533961baf5 100644 --- 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 5faf4388945..ed57cb0ed80 100644 --- 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 e8bc5d09e2d..3ec173b2a74 100644 --- 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 b88bae9aaeb..c975860e562 100644 --- 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 be29ccce771..ac1b412bd31 100644 --- 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)',\