diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 13dbb32f90..14769fe448 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -365,7 +365,7 @@ de.focus-shift jollyday-jackson - 0.35.1 + 1.4.0 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index c164cc7988..b333669a73 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -950,7 +950,7 @@ de.focus-shift jollyday-jackson - 0.35.1 + 1.4.0 compile diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 43327d13f6..cef36256ab 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -180,12 +180,12 @@ - openhab.tp;feature=jollyday;version=0.35.1 + openhab.tp;feature=jollyday;version=1.4.0 openhab.tp-jackson spifly mvn:org.threeten/threeten-extra/1.8.0 - mvn:de.focus-shift/jollyday-core/0.35.1 - mvn:de.focus-shift/jollyday-jackson/0.35.1 + mvn:de.focus-shift/jollyday-core/1.4.0 + mvn:de.focus-shift/jollyday-jackson/1.4.0 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index c506518e2a..25ee1de9e4 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 0a679170e0..e29f760738 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 2215bda54a..03cb6f6c49 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -77,5 +77,5 @@ Fragment-Host: org.openhab.core.automation.module.script stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 29fa293665..47aa36de44 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 58cb07c856..a360e0e17d 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index d48c7d4cf9..0d09d37d02 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -75,5 +75,5 @@ feature.openhab-config: \ stax2-api;version='[4.2.2,4.2.3)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 6432d4c02b..c7747fd1d8 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -126,6 +126,6 @@ Fragment-Host: org.openhab.core.model.item com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ - org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\ + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 43e452e3ba..102ca0456c 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -129,5 +129,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)' + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 8ecab29ac5..aabe15a96a 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -132,6 +132,6 @@ Fragment-Host: org.openhab.core.model.script stax2-api;version='[4.2.2,4.2.3)',\ com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ - org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\ + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 4a07a2ea63..74c8006789 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -135,6 +135,6 @@ Fragment-Host: org.openhab.core.model.thing com.google.guava;version='[33.3.0,33.3.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\ - de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\ - org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)' + org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\ + de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\ + de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'