From 0897e3d180128c5dc181782250f007041e10cd4c Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 13 Jan 2024 16:58:11 +0100 Subject: [PATCH] Resolve runbundles for Jollyday upgrade Related to https://github.com/openhab/openhab-core/pull/4033 Signed-off-by: Wouter Born --- .../itest.bndrun | 9 ++++++--- .../itest.bndrun | 12 +++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 6ff56692379ff..796915b59557e 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -19,13 +19,11 @@ Fragment-Host: org.openhab.automation.groovyscripting jakarta.annotation-api;version='[1.3.5,1.3.6)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ - jollyday;version='[0.5.10,0.5.11)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.threeten.extra;version='[1.5.0,1.5.1)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -85,4 +83,9 @@ Fragment-Host: org.openhab.automation.groovyscripting com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.16.0,2.16.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\ - org.osgi.service.component.annotations;version='[1.5.0,1.5.1)' + org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ + 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)' diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 612735605b017..d84e706983cb7 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -26,8 +26,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - jollyday;version='[0.5.10,0.5.11)',\ - org.threeten.extra;version='[1.5.0,1.5.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -79,4 +77,12 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn org.openhab.core.test;version='[4.2.0,4.2.1)',\ org.openhab.core.thing;version='[4.2.0,4.2.1)',\ org.openhab.core.transform;version='[4.2.0,4.2.1)',\ - org.osgi.service.component.annotations;version='[1.5.0,1.5.1)' + org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\ + com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.16.0,2.16.1)',\ + 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)'