From a26c35abd81f987d15ff7eddc3fdb52f93750ab6 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Tue, 13 Jan 2026 05:36:38 +0100 Subject: [PATCH] Upgrade Jollyday to 1.8.1 (#5266) Upgrades Jollyday from 1.5.4 to 1.8.1. 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 4cd401b0f..f5cb5ce4b 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -392,7 +392,7 @@ de.focus-shift jollyday-jackson - 1.5.4 + 1.8.1 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 63785759e..c5cc06ee8 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -959,7 +959,7 @@ de.focus-shift jollyday-jackson - 1.5.4 + 1.8.1 compile diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 3fc3e7294..e03614091 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.5.4 + openhab.tp;feature=jollyday;version=1.8.1 openhab.tp-jackson spifly mvn:org.threeten/threeten-extra/1.8.0 - mvn:de.focus-shift/jollyday-core/1.5.4 - mvn:de.focus-shift/jollyday-jackson/1.5.4 + mvn:de.focus-shift/jollyday-core/1.8.1 + mvn:de.focus-shift/jollyday-jackson/1.8.1 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index c1f1bc05b..401df4bbf 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.0,2.3.1)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ 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 bb7fd2daf..7ac237238 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.0,2.3.1)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ 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 625a360d8..bc299f37c 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.0,2.3.1)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ 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 94261f9b3..7befaab5f 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.0,2.3.1)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 29d876f7e..a644bcfb0 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.0,2.3.1)',\ org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index b4409a8cd..783fb7136 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.1.0,7.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index d85c833f1..c0e2f3ae4 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -122,8 +122,8 @@ Fragment-Host: org.openhab.core.model.item com.google.guava;version='[33.5.0,33.5.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 0597ff60f..a2c1a43db 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -123,8 +123,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.google.guava;version='[33.5.0,33.5.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 6c3e421d5..51cf779a3 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -128,8 +128,8 @@ Fragment-Host: org.openhab.core.model.script com.google.guava;version='[33.5.0,33.5.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 1274ce3f4..accc3861c 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -130,8 +130,8 @@ Fragment-Host: org.openhab.core.model.thing com.google.guava;version='[33.5.0,33.5.1)',\ biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ - de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.20.0,2.20.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index bb645d978..39d46eafa 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.1.0,7.1.1)',\ 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.5.4,1.5.5)',\ - de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\ + de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ + de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ 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.57,9.4.58)',\