Upgrade Jollyday to 0.28.1 (#16798)

* Upgrade Jollyday from 0.27.0 to 0.28.1.
* Upgrade jackson from 2.16.0 to 2.28.1
* Upgrade threeten-extra from 1.7.2 to 1.8.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 40c3f96fdcd095025dc155ec2b8dfb8908ec5640..b7722376f6f3226be3efd6b09c383eca1ec11e74 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -62,15 +62,15 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.core.jackson-databind;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.16.0,2.16.1)',\
+       com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.1,2.17.2)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
        org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
        org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
-       com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
-       org.threeten.extra;version='[1.7.2,1.7.3)',\
+       com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
+       org.threeten.extra;version='[1.8.0,1.8.1)',\
        stax2-api;version='[4.2.1,4.2.2)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
@@ -88,6 +88,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
-       de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
-       de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
+       de.focus_shift.jollyday-core;version='[0.28.1,0.28.2)',\
+       de.focus_shift.jollyday-jackson;version='[0.28.1,0.28.2)'
 

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 245b4180480299525fbca5f4741b08b4a28d213d..a5239a24dea4820b78a60e104a4a3db78fdb2226 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -63,11 +63,11 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
        org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
-       com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.core.jackson-databind;version='[2.16.0,2.16.1)',\
-       com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
-       org.threeten.extra;version='[1.7.2,1.7.3)',\
+       com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
+       com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
+       org.threeten.extra;version='[1.8.0,1.8.1)',\
        stax2-api;version='[4.2.1,4.2.2)',\
        org.openhab.core.addon;version='[4.2.0,4.2.1)',\
        com.sun.jna;version='[5.14.0,5.14.1)',\
@@ -85,5 +85,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
        org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
-       de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
-       de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
+       de.focus_shift.jollyday-core;version='[0.28.1,0.28.2)',\
+       de.focus_shift.jollyday-jackson;version='[0.28.1,0.28.2)'

diff --git a/pom.xml b/pom.xml
index b0bbaedeff3a1bd6ab2d30e9c4dad82f1e594f4b..6e5a9a98cca2cda4e5b444e4da98491b91b946f1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
-    <jackson.version>2.16.0</jackson.version>
+    <jackson.version>2.17.1</jackson.version>
     <jna.version>5.14.0</jna.version>
     <karaf.version>4.4.6</karaf.version>
     <netty.version>4.1.104.Final</netty.version>