From c42d105eb914c36dbc9fee1d628a7b087d973fb2 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Tue, 12 May 2026 07:20:25 +0200 Subject: [PATCH] Upgrade Jollyday to 1.9.3 (#5563) Upgrades jollyday-jackson from 1.8.1 to 1.9.3. For release notes, see: https://github.com/focus-shift/jollyday/releases Signed-off-by: Holger Friedrich --- bom/compile/pom.xml | 2 +- bom/runtime/pom.xml | 2 +- features/karaf/openhab-tp/src/main/feature/feature.xml | 6 +++--- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- itests/org.openhab.core.automation.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.ephemeris.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.model.item.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.model.rule.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.model.script.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.model.thing.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.thing.tests/itest.bndrun | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index b39b59625..a85bfb413 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -392,7 +392,7 @@ de.focus-shift jollyday-jackson - 1.8.1 + 1.9.3 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index eb8d07396..ca437b924 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -983,7 +983,7 @@ de.focus-shift jollyday-jackson - 1.8.1 + 1.9.3 compile diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 02b9c5609..ae881b71d 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -179,12 +179,12 @@ - openhab.tp;feature=jollyday;version=1.8.1 + openhab.tp;feature=jollyday;version=1.9.3 openhab.tp-jackson spifly mvn:org.threeten/threeten-extra/1.8.0 - mvn:de.focus-shift/jollyday-core/1.8.1 - mvn:de.focus-shift/jollyday-jackson/1.8.1 + mvn:de.focus-shift/jollyday-core/1.9.3 + mvn:de.focus-shift/jollyday-jackson/1.9.3 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index a70804bbe..e8277be1c 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ 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 6590d2cb0..617b02457 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ 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 923c757a8..60064f431 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -73,8 +73,8 @@ Fragment-Host: org.openhab.core.automation.module.script org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ 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 95f8a18fa..4c5fa0578 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 585b16dd1..c77827259 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 7855c01fa..26d1db079 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -70,8 +70,8 @@ feature.openhab-config: \ biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 3ec52263d..add293dff 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -123,8 +123,8 @@ Fragment-Host: org.openhab.core.model.item com.google.guava;version='[33.6.0,33.6.1)',\ biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 055c01d56..c9af7a37c 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -124,8 +124,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.google.guava;version='[33.6.0,33.6.1)',\ biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index e4b94ffdb..8659709a8 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -129,8 +129,8 @@ Fragment-Host: org.openhab.core.model.script com.google.guava;version='[33.6.0,33.6.1)',\ biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 033c0508f..f11261e5e 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -131,8 +131,8 @@ Fragment-Host: org.openhab.core.model.thing com.google.guava;version='[33.6.0,33.6.1)',\ biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 668f250d1..752f73d0d 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -75,8 +75,8 @@ Fragment-Host: org.openhab.core.thing biz.aQute.tester.junit-platform;version='[7.2.3,7.2.4)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ com.google.inject;version='[7.0.0,7.0.1)',\ - de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ - de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ + de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ io.github.classgraph.classgraph;version='[4.8.184,4.8.185)',\ org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.eclipse.jetty.alpn.client;version='[9.4.58,9.4.59)',\