diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 9cc30239e86..97119a86588 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -365,7 +365,7 @@ de.focus-shift jollyday-jackson - 0.30.0 + 0.32.0 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 488d35ade46..11324940987 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -950,7 +950,7 @@ de.focus-shift jollyday-jackson - 0.30.0 + 0.32.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 82265ed401b..3097522e7ef 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -174,12 +174,12 @@ - openhab.tp;feature=jollyday;version=0.30.0 + openhab.tp;feature=jollyday;version=0.32.0 openhab.tp-jackson spifly mvn:org.threeten/threeten-extra/1.8.0 - mvn:de.focus-shift/jollyday-core/0.30.0 - mvn:de.focus-shift/jollyday-jackson/0.30.0 + mvn:de.focus-shift/jollyday-core/0.32.0 + mvn:de.focus-shift/jollyday-jackson/0.32.0 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index a03a85c7646..79a06e54cab 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 org.openhab.core.thing;version='[4.3.0,4.3.1)',\ org.openhab.core.transform;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.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 02dc4082bb8..a53c507a6ee 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 org.openhab.core.thing;version='[4.3.0,4.3.1)',\ org.openhab.core.transform;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.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 f41be82c872..db597328bba 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 org.openhab.core.thing;version='[4.3.0,4.3.1)',\ org.openhab.core.transform;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.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 56e8bd68ef6..949a7459ae6 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 org.openhab.core.thing;version='[4.3.0,4.3.1)',\ org.openhab.core.transform;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 366eb8c69a9..32796eb5ef8 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 org.openhab.core.thing;version='[4.3.0,4.3.1)',\ org.openhab.core.transform;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index cd20bdb76e8..993ba500c51 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: \ org.openhab.core.ephemeris.tests;version='[4.3.0,4.3.1)',\ org.openhab.core.test;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 39cd95d40cb..2456c39f672 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -58,7 +58,6 @@ Fragment-Host: org.openhab.core.model.item com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ - com.google.guava;version='[33.3.0,33.4.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.sun.jna;version='[5.14.0,5.14.1)',\ io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ @@ -126,6 +125,7 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.transform;version='[4.3.0,4.3.1)',\ org.openhab.core.voice;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)',\ - org.openhab.core.model.rule.runtime;version='[4.3.0,4.3.1)' + com.google.guava;version='[33.3.0,33.3.1)',\ + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.3.0,4.3.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 650fa66027a..f752dd6b707 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -62,7 +62,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ - com.google.guava;version='[33.3.0,33.4.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.sun.jna;version='[5.14.0,5.14.1)',\ io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ @@ -129,5 +128,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.transform;version='[4.3.0,4.3.1)',\ org.openhab.core.voice;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)' + com.google.guava;version='[33.3.0,33.3.1)',\ + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.3.0,4.3.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 13e93d5337f..c1e596b1736 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -67,7 +67,6 @@ Fragment-Host: org.openhab.core.model.script com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ - com.google.guava;version='[33.3.0,33.4.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.sun.jna;version='[5.14.0,5.14.1)',\ io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ @@ -133,6 +132,7 @@ Fragment-Host: org.openhab.core.model.script org.openhab.core.transform;version='[4.3.0,4.3.1)',\ org.openhab.core.voice;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)',\ - org.openhab.core.model.rule.runtime;version='[4.3.0,4.3.1)' + com.google.guava;version='[33.3.0,33.3.1)',\ + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.3.0,4.3.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index ad5a313a222..de0c69d1c21 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -65,7 +65,6 @@ Fragment-Host: org.openhab.core.model.thing com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\ com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\ - com.google.guava;version='[33.3.0,33.4.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.sun.jna;version='[5.14.0,5.14.1)',\ io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ @@ -135,6 +134,7 @@ Fragment-Host: org.openhab.core.model.thing org.openhab.core.transform;version='[4.3.0,4.3.1)',\ org.openhab.core.voice;version='[4.3.0,4.3.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ - de.focus_shift.jollyday-core;version='[0.30.0,0.30.1)',\ - de.focus_shift.jollyday-jackson;version='[0.30.0,0.30.1)',\ - org.openhab.core.model.rule.runtime;version='[4.3.0,4.3.1)' + com.google.guava;version='[33.3.0,33.3.1)',\ + de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ + de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\ + org.openhab.core.model.persistence.runtime;version='[4.3.0,4.3.1)'