Upgrade Jollyday to 0.23.0

Upgrades Jollyday 0.5.10 (de.jollyday) to 0.23.0 of a more actively maintained fork (de.focus-shift).

This adds many missing holidays.

For release notes, see:

https://github.com/focus-shift/jollyday/releases

Fixes #3544

Signed-off-by: Wouter Born <github@maindrain.net>

bom/compile/pom.xml

@@ -364,20 +364,10 @@
 
     <!-- jollyday -->
     <dependency>
-      <groupId>de.jollyday</groupId>
-      <artifactId>jollyday</artifactId>
-      <version>0.5.10</version>
+      <groupId>de.focus-shift</groupId>
+      <artifactId>jollyday-jackson</artifactId>
+      <version>0.23.0-SNAPSHOT</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-runtime</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- JAXB -->

bom/runtime/pom.xml

@@ -948,20 +948,10 @@
 
     <!-- jollyday -->
     <dependency>
-      <groupId>de.jollyday</groupId>
-      <artifactId>jollyday</artifactId>
-      <version>0.5.10</version>
+      <groupId>de.focus-shift</groupId>
+      <artifactId>jollyday-jackson</artifactId>
+      <version>0.23.0-SNAPSHOT</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-runtime</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- jose4j -->

bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java

@@ -54,12 +54,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.jollyday.Holiday;
-import de.jollyday.HolidayManager;
-import de.jollyday.ManagerParameter;
-import de.jollyday.ManagerParameters;
-import de.jollyday.parameter.CalendarPartManagerParameter;
-import de.jollyday.util.ResourceUtil;
+import de.focus_shift.jollyday.core.Holiday;
+import de.focus_shift.jollyday.core.HolidayManager;
+import de.focus_shift.jollyday.core.ManagerParameter;
+import de.focus_shift.jollyday.core.ManagerParameters;
+import de.focus_shift.jollyday.core.parameter.CalendarPartManagerParameter;
+import de.focus_shift.jollyday.core.util.ResourceUtil;
 
 /**
  * This service provides functionality around ephemeris services and is the central service to be used directly by

features/karaf/openhab-tp/src/main/feature/feature.xml

@@ -173,9 +173,11 @@
 	</feature>
 
 	<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
-		<capability>openhab.tp;feature=jollyday;version=0.5.10</capability>
-		<bundle>mvn:org.threeten/threeten-extra/1.5.0</bundle>
-		<bundle>mvn:de.jollyday/jollyday/0.5.10</bundle>
+		<capability>openhab.tp;feature=jollyday;version=0.23.0</capability>
+		<feature dependency="true">openhab.tp-jackson</feature>
+		<bundle>mvn:org.threeten/threeten-extra/1.7.2</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-core/0.23.0-SNAPSHOT</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-jackson/0.23.0-SNAPSHOT</bundle>
 	</feature>
 
 	<feature name="openhab.tp-jmdns" description="An implementation of multi-cast DNS in Java." version="${project.version}">

itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun

@@ -75,5 +75,4 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.openhab.core.auth.oauth2client.tests;version='[4.2.0,4.2.1)',\
 	org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
 	org.openhab.core.io.net;version='[4.2.0,4.2.1)',\
-	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.test;version='[4.2.0,4.2.1)'

itests/org.openhab.core.automation.integration.tests/itest.bndrun

@@ -13,8 +13,6 @@ Fragment-Host: org.openhab.core.automation
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -74,5 +72,6 @@ Fragment-Host: org.openhab.core.automation
 	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.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.automation.module.core.tests/itest.bndrun

@@ -13,8 +13,6 @@ Fragment-Host: org.openhab.core.automation
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -74,5 +72,6 @@ Fragment-Host: org.openhab.core.automation
 	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.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.automation.module.script.tests/itest.bndrun

@@ -13,8 +13,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -71,5 +69,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	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.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.automation.module.timer.tests/itest.bndrun

@@ -13,8 +13,6 @@ Fragment-Host: org.openhab.core.automation
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -74,5 +72,6 @@ Fragment-Host: org.openhab.core.automation
 	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.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.automation.tests/itest.bndrun

@@ -13,8 +13,6 @@ Fragment-Host: org.openhab.core.automation
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -74,5 +72,6 @@ Fragment-Host: org.openhab.core.automation
 	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.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.config.core.tests/itest.bndrun

@@ -68,5 +68,4 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.config.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.config.core.tests;version='[4.2.0,4.2.1)',\
-	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.test;version='[4.2.0,4.2.1)'

itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun

@@ -74,5 +74,4 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.config.discovery.tests/itest.bndrun

@@ -73,5 +73,4 @@ Fragment-Host: org.openhab.core.config.discovery
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun

@@ -74,5 +74,4 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun

@@ -82,5 +82,4 @@ Provide-Capability: \
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.config.dispatch.tests/itest.bndrun

@@ -61,5 +61,4 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.config.dispatch;version='[4.2.0,4.2.1)',\
 	org.openhab.core.config.dispatch.tests;version='[4.2.0,4.2.1)',\
-	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.test;version='[4.2.0,4.2.1)'

itests/org.openhab.core.ephemeris.tests/itest.bndrun

@@ -8,7 +8,8 @@ feature.openhab-config: \
 
 -runrequires: \
 	${feature.openhab-config},\
-	bnd.identity;id='org.openhab.core.ephemeris.tests'
+	bnd.identity;id='org.openhab.core.ephemeris.tests',\
+	bnd.identity;id='de.focus_shift.jollyday-jackson'
 
 #
 # done
@@ -18,8 +19,6 @@ feature.openhab-config: \
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
@@ -71,4 +70,11 @@ feature.openhab-config: \
 	org.openhab.core.ephemeris;version='[4.2.0,4.2.1)',\
 	org.openhab.core.ephemeris.tests;version='[4.2.0,4.2.1)',\
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	de.focus_shift.jollyday-jackson;version='[0.23.0,0.23.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)',\
+	stax2-api;version='[4.2.1,4.2.2)'

itests/org.openhab.core.io.net.tests/itest.bndrun

@@ -73,5 +73,4 @@ Fragment-Host: org.openhab.core.io.net
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.io.net;version='[4.2.0,4.2.1)',\
 	org.openhab.core.io.net.tests;version='[4.2.0,4.2.1)',\
-	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.test;version='[4.2.0,4.2.1)'

itests/org.openhab.core.io.rest.core.tests/itest.bndrun

@@ -106,5 +106,4 @@ Fragment-Host: org.openhab.core.io.rest.core
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.model.item.tests/itest.bndrun

@@ -19,8 +19,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -94,7 +92,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
-	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.audio;version='[4.2.0,4.2.1)',\
 	org.openhab.core.automation;version='[4.2.0,4.2.1)',\
@@ -120,5 +117,8 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.model.rule.tests/itest.bndrun

@@ -23,8 +23,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -124,6 +122,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.openhab.core.model.item.runtime;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.model.script.tests/itest.bndrun

@@ -22,8 +22,6 @@ Fragment-Host: org.openhab.core.model.script
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -127,5 +125,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.openhab.core.model.item.runtime;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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.model.thing.tests/itest.bndrun

@@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
-	jollyday;version='[0.5.10,0.5.11)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -101,7 +99,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
-	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.audio;version='[4.2.0,4.2.1)',\
 	org.openhab.core.automation;version='[4.2.0,4.2.1)',\
@@ -129,5 +126,8 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)',\
+	de.focus_shift.jollyday-core;version='[0.23.0,0.23.1)',\
+	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
+	org.openhab.core.model.persistence.runtime;version='[4.2.0,4.2.1)',\
+	org.threeten.extra;version='[1.7.2,1.7.3)'

itests/org.openhab.core.storage.json.tests/itest.bndrun

@@ -67,5 +67,4 @@ Fragment-Host: org.openhab.core.storage.json
 	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.cm;version='[1.6.0,1.6.1)',\
 	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)'

itests/org.openhab.core.tests/itest.bndrun

@@ -65,5 +65,4 @@ Fragment-Host: org.openhab.core
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
 	org.openhab.core;version='[4.2.0,4.2.1)',\
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
-	org.openhab.core.tests;version='[4.2.0,4.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.tests;version='[4.2.0,4.2.1)'