Skip to content

Commit eafa535

Browse files
holgerfriedrichholgerfriedrich
committed
Upgrade jollyday-jackson to 2.3.0
* Upgrade jollyday-jackson from 2.2.0 to 2.3.0 * Add new transitive dependency jspecify 1.0.0 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 0890dec commit eafa535

14 files changed

Lines changed: 50 additions & 38 deletions

File tree

‎bom/compile/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
<dependency>
393393
<groupId>de.focus-shift</groupId>
394394
<artifactId>jollyday-jackson</artifactId>
395-
<version>2.2.0</version>
395+
<version>2.3.0</version>
396396
<scope>compile</scope>
397397
</dependency>
398398

‎bom/runtime/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@
957957
<dependency>
958958
<groupId>de.focus-shift</groupId>
959959
<artifactId>jollyday-jackson</artifactId>
960-
<version>2.2.0</version>
960+
<version>2.3.0</version>
961961
<scope>compile</scope>
962962
</dependency>
963963

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,13 @@
177177
</feature>
178178

179179
<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
180-
<capability>openhab.tp;feature=jollyday;version=2.2.0</capability>
180+
<capability>openhab.tp;feature=jollyday;version=2.3.0</capability>
181181
<feature dependency="true">openhab.tp-jackson</feature>
182182
<feature dependency="true">spifly</feature>
183183
<bundle>mvn:org.threeten/threeten-extra/1.8.0</bundle>
184-
<bundle>mvn:de.focus-shift/jollyday-core/2.2.0</bundle>
185-
<bundle>mvn:de.focus-shift/jollyday-jackson/2.2.0</bundle>
184+
<bundle>mvn:de.focus-shift/jollyday-core/2.3.0</bundle>
185+
<bundle>mvn:de.focus-shift/jollyday-jackson/2.3.0</bundle>
186+
<bundle>mvn:org.jspecify/jspecify/1.0.0</bundle>
186187
</feature>
187188

188189
<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‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ Fragment-Host: org.openhab.core.automation
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7777
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
79-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
80-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
79+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
80+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
8181
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
8282
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
8383
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
8484
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
8585
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
86-
org.snakeyaml.engine;version='[3.0.1,3.0.2)'
86+
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
87+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ Fragment-Host: org.openhab.core.automation
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7777
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
79-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
80-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
79+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
80+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
8181
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
8282
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
8383
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
8484
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
8585
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
86-
org.snakeyaml.engine;version='[3.0.1,3.0.2)'
86+
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
87+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@ Fragment-Host: org.openhab.core.automation.module.script
7373
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7474
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7575
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
76-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
77-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
76+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
77+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
7878
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
7979
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
8080
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
8181
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
8282
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
83-
org.snakeyaml.engine;version='[3.0.1,3.0.2)'
83+
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
84+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ Fragment-Host: org.openhab.core.automation
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7777
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
79-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
80-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
79+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
80+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
8181
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
8282
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
8383
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
8484
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
8585
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
86-
org.snakeyaml.engine;version='[3.0.1,3.0.2)'
86+
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
87+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ Fragment-Host: org.openhab.core.automation
7676
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7777
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
7878
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
79-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
80-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
79+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
80+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
8181
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
8282
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
8383
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
8484
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
8585
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
86-
org.snakeyaml.engine;version='[3.0.1,3.0.2)'
86+
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
87+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ feature.openhab-config: \
7070
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
7171
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
7272
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
73-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
74-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
73+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
74+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
7575
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
7676
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
7777
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
78-
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)'
78+
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
79+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,13 @@ Fragment-Host: org.openhab.core.model.item
123123
com.google.guava;version='[33.5.0,33.5.1)',\
124124
biz.aQute.tester.junit-platform;version='[7.2.1,7.2.2)',\
125125
org.ops4j.pax.logging.pax-logging-api;version='[2.3.2,2.3.3)',\
126-
de.focus_shift.jollyday-core;version='[2.2.0,2.2.1)',\
127-
de.focus_shift.jollyday-jackson;version='[2.2.0,2.2.1)',\
126+
de.focus_shift.jollyday-core;version='[2.3.0,2.3.1)',\
127+
de.focus_shift.jollyday-jackson;version='[2.3.0,2.3.1)',\
128128
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
129129
tools.jackson.core.jackson-core;version='[3.1.0,3.1.1)',\
130130
tools.jackson.core.jackson-databind;version='[3.1.0,3.1.1)',\
131131
tools.jackson.dataformat.jackson-dataformat-xml;version='[3.1.0,3.1.1)',\
132132
tools.jackson.dataformat.jackson-dataformat-yaml;version='[3.1.0,3.1.1)',\
133133
org.snakeyaml.engine;version='[3.0.1,3.0.2)',\
134-
org.osgi.service.cm;version='[1.6.1,1.6.2)'
134+
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
135+
org.jspecify.jspecify;version='[1.0.0,1.0.1)'

0 commit comments

Comments
 (0)