demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade Jollyday to 0.23.2 (#4033)

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

* This adds many missing holidays.
* Also removes the workaround for the Danish Great Prayer Day introduced by #3573.

For release notes, see:

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

Fixes #3544

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2024-01-14 15:19:15 +01:00 committed by GitHub
parent b77f954848
commit 6495f4e256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 125 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bom/compile/pom.xml
View File

@ -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.2</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 -->

16
bom/runtime/pom.xml
View File

@ -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.2</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 -->

5
bundles/org.openhab.core.ephemeris/bnd.bnd Normal file
View File

@ -0,0 +1,5 @@
Automatic-Module-Name: ${def;bsn}
Bundle-SymbolicName: ${project.artifactId}
Import-Package: \
*, \
de.focus_shift.jollyday.jackson

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

@ -54,12 +54,12 @@ import org.osgi.service.component.annotations.Reference;
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

17
bundles/org.openhab.core.ephemeris/src/main/resources/jollyday/holidays/Holidays_dk.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:Configuration hierarchy="dk" description="Denmark" xmlns:tns="http://www.example.org/Holiday"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
<tns:Holidays>
<tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
<tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
<tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
<tns:ChristianHoliday type="EASTER"/>
<tns:ChristianHoliday type="MAUNDY_THURSDAY"/>
<tns:ChristianHoliday type="GOOD_FRIDAY"/>
<tns:ChristianHoliday type="EASTER_MONDAY"/>
<tns:ChristianHoliday type="GENERAL_PRAYER_DAY" validTo="2023"/>
<tns:ChristianHoliday type="ASCENSION_DAY"/>
<tns:ChristianHoliday type="WHIT_MONDAY"/>
<tns:ChristianHoliday type="PENTECOST"/>
</tns:Holidays>
</tns:Configuration>

12
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -91,6 +91,7 @@
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.16.0</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.16.0</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.16.0</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.2</bundle>
</feature>
@ -122,7 +123,7 @@
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.1</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.2</bundle>
@ -173,9 +174,12 @@
</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.2</capability>
<feature dependency="true">openhab.tp-jackson</feature>
<feature dependency="true">spifly</feature>
<bundle>mvn:org.threeten/threeten-extra/1.7.2</bundle>
<bundle>mvn:de.focus-shift/jollyday-core/0.23.2</bundle>
<bundle>mvn:de.focus-shift/jollyday-jackson/0.23.2</bundle>
</feature>
<feature name="openhab.tp-jmdns" description="An implementation of multi-cast DNS in Java." version="${project.version}">

3
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View File

@ -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)'

13
itests/org.openhab.core.automation.integration.tests/itest.bndrun
View File

@ -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,12 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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)'

13
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View File

@ -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,12 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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)'

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

@ -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,12 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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)'

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

@ -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,12 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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)'

13
itests/org.openhab.core.automation.tests/itest.bndrun
View File

@ -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,12 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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)'

3
itests/org.openhab.core.config.core.tests/itest.bndrun
View File

@ -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)'

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

@ -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)'

1
itests/org.openhab.core.config.discovery.tests/itest.bndrun
View File

@ -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)'

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

@ -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)'

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

@ -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)'

3
itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View File

@ -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)'

11
itests/org.openhab.core.ephemeris.tests/itest.bndrun
View File

@ -18,8 +18,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 +69,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)',\
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)'

3
itests/org.openhab.core.io.net.tests/itest.bndrun
View File

@ -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)'

1
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -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)'

16
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -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,14 @@ 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)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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.model.persistence.runtime;version='[4.2.0,4.2.1)'

15
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -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,13 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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.model.persistence.runtime;version='[4.2.0,4.2.1)'

14
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -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,13 @@ 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)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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.model.persistence.runtime;version='[4.2.0,4.2.1)'

16
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -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,14 @@ 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)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.threeten.extra;version='[1.7.2,1.7.3)',\
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)',\
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.model.persistence.runtime;version='[4.2.0,4.2.1)'

1
itests/org.openhab.core.storage.json.tests/itest.bndrun
View File

@ -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)'

3
itests/org.openhab.core.tests/itest.bndrun
View File

@ -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)'