Skip to content

Commit ce37425

Browse files
authored
Upgrade Jollyday to 1.4.0 (openhab#4566)
Upgrades Jollyday from 0.35.1 to 1.4.0. For release notes, see: https://github.com/focus-shift/jollyday/releases Signed-off-by: Wouter Born <[email protected]>
1 parent 6922d60 commit ce37425

File tree

13 files changed

+28
-28
lines changed

13 files changed

+28
-28
lines changed

bom/compile/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
<dependency>
366366
<groupId>de.focus-shift</groupId>
367367
<artifactId>jollyday-jackson</artifactId>
368-
<version>0.35.1</version>
368+
<version>1.4.0</version>
369369
<scope>compile</scope>
370370
</dependency>
371371

bom/runtime/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@
950950
<dependency>
951951
<groupId>de.focus-shift</groupId>
952952
<artifactId>jollyday-jackson</artifactId>
953-
<version>0.35.1</version>
953+
<version>1.4.0</version>
954954
<scope>compile</scope>
955955
</dependency>
956956

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@
180180
</feature>
181181

182182
<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
183-
<capability>openhab.tp;feature=jollyday;version=0.35.1</capability>
183+
<capability>openhab.tp;feature=jollyday;version=1.4.0</capability>
184184
<feature dependency="true">openhab.tp-jackson</feature>
185185
<feature dependency="true">spifly</feature>
186186
<bundle>mvn:org.threeten/threeten-extra/1.8.0</bundle>
187-
<bundle>mvn:de.focus-shift/jollyday-core/0.35.1</bundle>
188-
<bundle>mvn:de.focus-shift/jollyday-jackson/0.35.1</bundle>
187+
<bundle>mvn:de.focus-shift/jollyday-core/1.4.0</bundle>
188+
<bundle>mvn:de.focus-shift/jollyday-jackson/1.4.0</bundle>
189189
</feature>
190190

191191
<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

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation
8080
stax2-api;version='[4.2.2,4.2.3)',\
8181
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8282
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
83-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
84-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
83+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
84+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation
8080
stax2-api;version='[4.2.2,4.2.3)',\
8181
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8282
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
83-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
84-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
83+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
84+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ Fragment-Host: org.openhab.core.automation.module.script
7777
stax2-api;version='[4.2.2,4.2.3)',\
7878
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
7979
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
80-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
81-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
80+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
81+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation
8080
stax2-api;version='[4.2.2,4.2.3)',\
8181
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8282
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
83-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
84-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
83+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
84+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ Fragment-Host: org.openhab.core.automation
8080
stax2-api;version='[4.2.2,4.2.3)',\
8181
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8282
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
83-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
84-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
83+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
84+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ feature.openhab-config: \
7575
stax2-api;version='[4.2.2,4.2.3)',\
7676
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
7777
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
78-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
79-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
78+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
79+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ Fragment-Host: org.openhab.core.model.item
126126
com.google.guava;version='[33.3.0,33.3.1)',\
127127
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
128128
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
129-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
130-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\
131-
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)'
129+
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
130+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
131+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
129129
com.google.guava;version='[33.3.0,33.3.1)',\
130130
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
131131
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
132-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
133-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)'
132+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
133+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,6 @@ Fragment-Host: org.openhab.core.model.script
132132
stax2-api;version='[4.2.2,4.2.3)',\
133133
com.google.guava;version='[33.3.0,33.3.1)',\
134134
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
135-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
136-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\
137-
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)'
135+
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
136+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
137+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ Fragment-Host: org.openhab.core.model.thing
135135
com.google.guava;version='[33.3.0,33.3.1)',\
136136
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
137137
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
138-
de.focus_shift.jollyday-core;version='[0.35.1,0.35.2)',\
139-
de.focus_shift.jollyday-jackson;version='[0.35.1,0.35.2)',\
140-
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)'
138+
org.openhab.core.model.rule.runtime;version='[5.0.0,5.0.1)',\
139+
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
140+
de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'

0 commit comments

Comments
 (0)