Resolve runbundles for Xtext and Jollyday upgrades (#17509)

Related to:

* openhab/openhab-core#4398
* openhab/openhab-core#4403

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 81ad853526e6404004df6f0d2f948771e0e5109a..93e0890adb26b2b18fe6bf9549990c1d75bd9735 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -52,9 +52,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
        ch.qos.logback.core;version='[1.3.14,1.3.15)',\
        com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
-       com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
-       com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
-       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
        org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
        org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
        com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
@@ -87,7 +84,10 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.openhab.core.thing;version='[4.3.0,4.3.1)',\
        org.openhab.core.transform;version='[4.3.0,4.3.1)',\
        stax2-api;version='[4.2.2,4.2.3)',\
-       de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\
-       de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)',\
-       org.jsr-305;version='[3.0.2,3.0.3)'
+       org.jsr-305;version='[3.0.2,3.0.3)',\
+       com.fasterxml.jackson.core.jackson-core;version='[2.17.2,2.17.3)',\
+       com.fasterxml.jackson.core.jackson-databind;version='[2.17.2,2.17.3)',\
+       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.2,2.17.3)',\
+       de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\
+       de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)'
 

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 0afb111dfcde036aea09011431bd50268b1e6ab1..3c8dfb2439a9f67444b42df3d0effc9bdcaae898 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -85,5 +85,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.openhab.core.thing;version='[4.3.0,4.3.1)',\
        org.openhab.core.transform;version='[4.3.0,4.3.1)',\
        stax2-api;version='[4.2.2,4.2.3)',\
-       de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\
-       de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)'
+       de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\
+       de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 0350e6fc18aebb33e7499f3a83c7afd9a17f4100..261e0c68613d1cbd0bcd761a30ec7cf98bb419e3 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -122,12 +122,13 @@ Import-Package: \
        com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
        com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
        com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
-       com.google.guava;version='[33.2.0,33.2.1)',\
        com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
        com.google.re2j.re2j;version='[1.2.0,1.2.1)',\
        com.hubspot.jinjava.jinjava;version='[2.7.3,2.7.4)',\
        javassist;version='[3.29.2,3.29.3)',\
        org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
        org.apache.commons.lang3;version='[3.14.0,3.14.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-       org.yaml.snakeyaml;version='[2.2.0,2.2.1)'
+       org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
+       com.fasterxml.jackson.datatype.jackson-datatype-jdk8;version='[2.17.1,2.17.2)',\
+       com.google.guava;version='[33.3.0,33.3.1)',\
+       com.hubspot.immutables.immutables-exceptions;version='[1.9.0,1.9.1)'