From 3d0996bf838836c320c467fa9065ba9a00ae3cc6 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 21 Jun 2025 13:49:20 +0200
Subject: [PATCH] Upgrade Jollyday to 1.5.4 (#4862)

Upgrades Jollyday from 1.5.0 to 1.5.4.

For release notes, see:

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

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bom/compile/pom.xml                                         | 2 +-
 bom/runtime/pom.xml                                         | 2 +-
 features/karaf/openhab-tp/src/main/feature/feature.xml      | 6 +++---
 .../itest.bndrun                                            | 6 +++---
 .../itest.bndrun                                            | 6 +++---
 .../itest.bndrun                                            | 6 +++---
 .../itest.bndrun                                            | 6 +++---
 itests/org.openhab.core.automation.tests/itest.bndrun       | 6 +++---
 .../itest.bndrun                                            | 1 -
 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 ++--
 14 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index cdc36779c..77e38c2cf 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -360,7 +360,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.4</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 5fb094946..591935918 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -958,7 +958,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.4</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 6d0c8ed1c..cf39155d1 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -175,12 +175,12 @@
 	</feature>
 
 	<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
-		<capability>openhab.tp;feature=jollyday;version=1.5.0</capability>
+		<capability>openhab.tp;feature=jollyday;version=1.5.4</capability>
 		<feature dependency="true">openhab.tp-jackson</feature>
 		<feature dependency="true">spifly</feature>
 		<bundle>mvn:org.threeten/threeten-extra/1.8.0</bundle>
-		<bundle>mvn:de.focus-shift/jollyday-core/1.5.0</bundle>
-		<bundle>mvn:de.focus-shift/jollyday-jackson/1.5.0</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-core/1.5.4</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-jackson/1.5.4</bundle>
 	</feature>
 
 	<feature name="openhab.tp-jmdns" description="An implementation of multi-cast DNS in Java." version="${project.version}">
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 321eb9245..d0ac0c944 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -81,6 +81,6 @@ Fragment-Host: org.openhab.core.automation
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\
-	org.openhab.core.semantics;version='[5.0.0,5.0.1)'
+	org.openhab.core.semantics;version='[5.0.0,5.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)'
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 ce823fddd..525c98509 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -81,6 +81,6 @@ Fragment-Host: org.openhab.core.automation
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\
-	org.openhab.core.semantics;version='[5.0.0,5.0.1)'
+	org.openhab.core.semantics;version='[5.0.0,5.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)'
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 04b277f42..c7a3430a1 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -78,6 +78,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\
-	org.openhab.core.semantics;version='[5.0.0,5.0.1)'
+	org.openhab.core.semantics;version='[5.0.0,5.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)'
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 c931efa0a..5206537cf 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -81,6 +81,6 @@ Fragment-Host: org.openhab.core.automation
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\
-	org.openhab.core.semantics;version='[5.0.0,5.0.1)'
+	org.openhab.core.semantics;version='[5.0.0,5.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)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index a262542d2..405579d2d 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -81,6 +81,6 @@ Fragment-Host: org.openhab.core.automation
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)',\
-	org.openhab.core.semantics;version='[5.0.0,5.0.1)'
+	org.openhab.core.semantics;version='[5.0.0,5.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)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
index 395fb1231..1a73e0d56 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
@@ -29,7 +29,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
-	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.2,2.2.3)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
 	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 571d96335..4317c9761 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -74,5 +74,5 @@ feature.openhab-config: \
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.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)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index d6976694b..85468f2aa 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -128,5 +128,5 @@ Fragment-Host: org.openhab.core.model.item
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.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)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 8d20d0f66..7cc3cd33c 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -130,5 +130,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.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)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index 7cd9af467..e3f2dd54c 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -134,5 +134,5 @@ Fragment-Host: org.openhab.core.model.script
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.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)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index da1fe16ba..76130f304 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -137,5 +137,5 @@ Fragment-Host: org.openhab.core.model.thing
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
-	de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.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)'