From 297d54ed525e4b15b4ed6ac1522b4ca41ef6e0b6 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Tue, 3 Dec 2024 21:30:59 +0100
Subject: [PATCH] Upgrade Jollyday to 0.35.1 (#4471)

Upgrades Jollyday from 0.32.0 to 0.35.1.

For release notes, see:

* https://github.com/focus-shift/jollyday/releases/tag/v0.33.0
* https://github.com/focus-shift/jollyday/releases/tag/v0.34.0
* https://github.com/focus-shift/jollyday/releases/tag/v0.35.0
* https://github.com/focus-shift/jollyday/releases/tag/v0.35.1

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 +++---
 itests/org.openhab.core.ephemeris.tests/itest.bndrun        | 6 +++---
 itests/org.openhab.core.model.item.tests/itest.bndrun       | 6 +++---
 itests/org.openhab.core.model.rule.tests/itest.bndrun       | 6 +++---
 itests/org.openhab.core.model.script.tests/itest.bndrun     | 6 +++---
 itests/org.openhab.core.model.thing.tests/itest.bndrun      | 6 +++---
 13 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index f3ea632ae..d31f7c18c 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -365,7 +365,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>0.32.0</version>
+      <version>0.35.1</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 31452f12f..d2b06bd06 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -950,7 +950,7 @@
     <dependency>
       <groupId>de.focus-shift</groupId>
       <artifactId>jollyday-jackson</artifactId>
-      <version>0.32.0</version>
+      <version>0.35.1</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 9cb0d8e5f..e00fd101c 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 @@
 	</feature>
 
 	<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
-		<capability>openhab.tp;feature=jollyday;version=0.32.0</capability>
+		<capability>openhab.tp;feature=jollyday;version=0.35.1</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/0.32.0</bundle>
-		<bundle>mvn:de.focus-shift/jollyday-jackson/0.32.0</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-core/0.35.1</bundle>
+		<bundle>mvn:de.focus-shift/jollyday-jackson/0.35.1</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 2d07e4d29..e180b5d34 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -79,7 +79,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
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 a45e28f5e..b54718096 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -79,7 +79,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
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 ffaa52b47..ce94e6e6f 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -76,7 +76,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
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 064875923..08b87875b 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -79,7 +79,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 790debca3..bbfad3a06 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -79,7 +79,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index d982277b5..9ca9b5efe 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -74,7 +74,7 @@ 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.32.0,0.32.1)',\
-	de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index ce4deb197..2a2f93d50 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -125,7 +125,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.voice;version='[4.3.0,4.3.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	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)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index a1fccc3fb..9100cfca0 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -128,8 +128,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.voice;version='[4.3.0,4.3.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	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)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
 	org.openhab.core.model.item.runtime;version='[4.3.0,4.3.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index ba084a02d..a236959fe 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -132,7 +132,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.voice;version='[4.3.0,4.3.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	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)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.openhab.core.model.item.runtime;version='[4.3.0,4.3.1)'
+	org.openhab.core.model.item.runtime;version='[4.3.0,4.3.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)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 1e5f115e4..8b1b67336 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -134,7 +134,7 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.voice;version='[4.3.0,4.3.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	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)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.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)'