Resolve runbundles for Jollyday upgrade (#16632)

Related to openhab/openhab-core#4178

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 57622159b8ffda487a5fc28aaf96d484d06968f0..bd18e8746a2d2e04ffac58c1b8b6e02b73fbbfd4 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -72,8 +72,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
        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)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
        org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
@@ -89,4 +87,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\
+       de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
+       de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index dfcc293bf552be071f8a12bb3abfd4096406e6af..a86ca7efbc83bb7cc8056d8cb3e1b603ea42b529 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -69,8 +69,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
        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)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
        org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
@@ -86,4 +84,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.2.6,2.2.7)',\
+       de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
+       de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 4ab38a06d4cd609813a1230052903a3751c819b6..1ec04ffc401099d65f791ce725d50d91357802b1 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -103,7 +103,6 @@ Import-Package: \
        org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
        org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
        org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\
        org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index a9a5c14def6af278e107b75be6cba0300a32e70e..886b61e2a3aab59ab0e414f3f7833001032f02da 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -103,7 +103,6 @@ Import-Package: \
        org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
        org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
        org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\
        org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\

diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
index f9b91ebe16bfac35a26159f91239fd2e059643ac..98a347636e5844268d0e0902f9d715ffa5acad37 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -104,7 +104,6 @@ Import-Package: \
        org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
        org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
        org.eclipse.jetty.http;version='[9.4.53,9.4.54)',\
        org.eclipse.jetty.io;version='[9.4.53,9.4.54)',\