From 887a544473d96ce20b39a7d478169e02bd8a8c1d Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 13 Aug 2023 22:44:24 +0200 Subject: [PATCH 1/2] Resolve runbundles for workaround Related to openhab/openhab-core#3756 Signed-off-by: Wouter Born --- .../org.openhab.automation.groovyscripting.tests/itest.bndrun | 4 +++- .../itest.bndrun | 4 +++- itests/org.openhab.binding.astro.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.avmfritz.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.feed.tests/itest.bndrun | 3 ++- itests/org.openhab.binding.hue.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.max.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.mielecloud.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.modbus.tests/itest.bndrun | 4 +++- .../org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun | 4 +++- .../org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.nest.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.ntp.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.systeminfo.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.tradfri.tests/itest.bndrun | 4 +++- itests/org.openhab.binding.wemo.tests/itest.bndrun | 4 +++- itests/org.openhab.persistence.mapdb.tests/itest.bndrun | 4 +++- 18 files changed, 53 insertions(+), 18 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 0d683934a5fa2..92113b57ae88e 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -77,4 +77,6 @@ Fragment-Host: org.openhab.automation.groovyscripting org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 7917f93d63e18..463fb724a10fd 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -71,4 +71,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index 2cda47dd26fba..d08683e7f6120 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -54,4 +54,6 @@ Fragment-Host: org.openhab.binding.astro org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.storage.json;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index 74964b952029d..59c3867bc6898 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -80,4 +80,6 @@ Fragment-Host: org.openhab.binding.avmfritz org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index 17022265f0f0d..dad472181edc3 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -73,4 +73,5 @@ Fragment-Host: org.openhab.binding.feed org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)' diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index e486100ff2b5f..832f2a372e936 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -86,4 +86,6 @@ Fragment-Host: org.openhab.binding.hue org.openhab.core.io.transport.mdns;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 18f592c616c21..38ced4da4dbe6 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -66,4 +66,6 @@ Fragment-Host: org.openhab.binding.max org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index 467a85ae35c5f..711af5555e69d 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -86,4 +86,6 @@ Fragment-Host: org.openhab.binding.mielecloud org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index a79138ffd9743..e7316c0d4e96b 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -74,4 +74,6 @@ Fragment-Host: org.openhab.binding.modbus org.openhab.core.io.transport.modbus;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 7721a28b8e19a..2610328ac04fc 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -107,4 +107,6 @@ Import-Package: \ org.openhab.core.io.transport.mqtt;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun index d0e0ef45a1303..c6d1adb7e50f9 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun @@ -107,5 +107,7 @@ Import-Package: \ org.openhab.core.io.transport.mqtt;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index ceefd8aa8d4db..ef0d9425e52d6 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -108,4 +108,6 @@ Import-Package: \ org.openhab.core.io.transport.mqtt;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' \ No newline at end of file + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' \ No newline at end of file diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index 412c90cc10ca8..7233db97667b2 100644 --- a/itests/org.openhab.binding.nest.tests/itest.bndrun +++ b/itests/org.openhab.binding.nest.tests/itest.bndrun @@ -110,4 +110,6 @@ Fragment-Host: org.openhab.binding.nest org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 4711e9201e622..2012310d91286 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -70,4 +70,6 @@ Fragment-Host: org.openhab.binding.ntp org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index 807c67efdb5c6..7cb1b52c5f5c1 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -73,4 +73,6 @@ Fragment-Host: org.openhab.binding.systeminfo org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 83a2cc0937999..7401a3b31e3aa 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -77,4 +77,6 @@ Fragment-Host: org.openhab.binding.tradfri org.openhab.core.io.transport.mdns;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index 3f4d1f23c9915..0b803160ef020 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -82,4 +82,6 @@ Fragment-Host: org.openhab.binding.wemo org.openhab.core.io.transport.upnp;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ - org.openhab.core.transform;version='[4.1.0,4.1.1)' + org.openhab.core.transform;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index cb6ed71fda9e5..e5e1bf1d507b8 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -64,4 +64,6 @@ Fragment-Host: org.openhab.persistence.mapdb org.openhab.core.persistence;version='[4.1.0,4.1.1)',\ org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.persistence.mapdb;version='[4.1.0,4.1.1)',\ - org.openhab.persistence.mapdb.tests;version='[4.1.0,4.1.1)' + org.openhab.persistence.mapdb.tests;version='[4.1.0,4.1.1)',\ + org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ + org.osgi.service.cm;version='[1.6.0,1.6.1)' From e778866ae9b0e0c748727b7eb4305a0d11f67dbe Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Mon, 14 Aug 2023 09:10:53 +0200 Subject: [PATCH 2/2] Add missing new line Signed-off-by: Wouter Born --- itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index ef0d9425e52d6..888e441847564 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -110,4 +110,4 @@ Import-Package: \ org.openhab.core.thing;version='[4.1.0,4.1.1)',\ org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ - org.osgi.service.cm;version='[1.6.0,1.6.1)' \ No newline at end of file + org.osgi.service.cm;version='[1.6.0,1.6.1)'