From 0b9ea4d3f11ba32a1dfd9e849f576820c9b1ca95 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 14 Apr 2024 22:21:17 +0200 Subject: [PATCH] Resolve runbundles for Jollyday upgrade (#16632) Related to openhab/openhab-core#4178 Signed-off-by: Wouter Born --- .../itest.bndrun | 6 +++--- .../itest.bndrun | 6 +++--- .../itest.bndrun | 1 - itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun | 1 - .../itest.bndrun | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 57622159b8f..bd18e8746a2 100644 --- 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 dfcc293bf55..a86ca7efbc8 100644 --- 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 4ab38a06d4c..1ec04ffc401 100644 --- 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 a9a5c14def6..886b61e2a3a 100644 --- 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 f9b91ebe16b..98a347636e5 100644 --- 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)',\