Skip to content

Commit 343470d

Browse files
authored
Upgrade Jollyday to 1.5.0 (#4620)
Upgrades Jollyday from 1.4.0 to 1.5.0. For release notes, see: https://github.com/focus-shift/jollyday/releases Signed-off-by: Wouter Born <[email protected]>
1 parent 6bf5960 commit 343470d

File tree

13 files changed

+35
-35
lines changed

13 files changed

+35
-35
lines changed

bom/compile/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
<dependency>
359359
<groupId>de.focus-shift</groupId>
360360
<artifactId>jollyday-jackson</artifactId>
361-
<version>1.4.0</version>
361+
<version>1.5.0</version>
362362
<scope>compile</scope>
363363
</dependency>
364364

bom/runtime/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@
961961
<dependency>
962962
<groupId>de.focus-shift</groupId>
963963
<artifactId>jollyday-jackson</artifactId>
964-
<version>1.4.0</version>
964+
<version>1.5.0</version>
965965
<scope>compile</scope>
966966
</dependency>
967967

features/karaf/openhab-tp/src/main/feature/feature.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,12 @@
175175
</feature>
176176

177177
<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
178-
<capability>openhab.tp;feature=jollyday;version=1.4.0</capability>
178+
<capability>openhab.tp;feature=jollyday;version=1.5.0</capability>
179179
<feature dependency="true">openhab.tp-jackson</feature>
180180
<feature dependency="true">spifly</feature>
181181
<bundle>mvn:org.threeten/threeten-extra/1.8.0</bundle>
182-
<bundle>mvn:de.focus-shift/jollyday-core/1.4.0</bundle>
183-
<bundle>mvn:de.focus-shift/jollyday-jackson/1.4.0</bundle>
182+
<bundle>mvn:de.focus-shift/jollyday-core/1.5.0</bundle>
183+
<bundle>mvn:de.focus-shift/jollyday-jackson/1.5.0</bundle>
184184
</feature>
185185

186186
<feature name="openhab.tp-jmdns" description="An implementation of multi-cast DNS in Java." version="${project.version}">

itests/org.openhab.core.automation.integration.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation
7979
stax2-api;version='[4.2.2,4.2.3)',\
8080
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8181
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
82-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
83-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
8482
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
8583
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
86-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
84+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
85+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
86+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.automation.module.core.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation
7979
stax2-api;version='[4.2.2,4.2.3)',\
8080
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8181
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
82-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
83-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
8482
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
8583
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
86-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
84+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
85+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
86+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.automation.module.script.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation.module.script
7676
stax2-api;version='[4.2.2,4.2.3)',\
7777
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
7878
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
79-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
80-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
8179
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
8280
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
83-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
81+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
82+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
83+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.automation.module.timer.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation
7979
stax2-api;version='[4.2.2,4.2.3)',\
8080
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8181
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
82-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
83-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
8482
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
8583
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
86-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
84+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
85+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
86+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.automation.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation
7979
stax2-api;version='[4.2.2,4.2.3)',\
8080
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8181
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
82-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
83-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
8482
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
8583
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
86-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
84+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
85+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
86+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.ephemeris.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ feature.openhab-config: \
7474
stax2-api;version='[4.2.2,4.2.3)',\
7575
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
7676
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
77-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
78-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
79-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)'
77+
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
78+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
79+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.model.item.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ Fragment-Host: org.openhab.core.model.item
126126
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
127127
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
128128
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
129-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
130-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
131129
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
132130
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
133-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
131+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
132+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
133+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.model.rule.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ Fragment-Host: org.openhab.core.model.rule.runtime
128128
com.google.guava;version='[33.3.1,33.3.2)',\
129129
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
130130
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
131-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
132-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
133131
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
134132
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
135-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
133+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
134+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
135+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.model.script.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ Fragment-Host: org.openhab.core.model.script
132132
com.google.guava;version='[33.3.1,33.3.2)',\
133133
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
134134
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
135-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
136-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
137135
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
138136
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
139-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
137+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
138+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
139+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

itests/org.openhab.core.model.thing.tests/itest.bndrun

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ Fragment-Host: org.openhab.core.model.thing
135135
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
136136
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
137137
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
138-
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
139-
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
140138
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
141139
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
142-
org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
140+
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
141+
de.focus_shift.jollyday-core;version='[1.5.0,1.5.1)',\
142+
de.focus_shift.jollyday-jackson;version='[1.5.0,1.5.1)'

0 commit comments

Comments
 (0)