From f8cbca62b72fb8d9957cf6e4f3110ba2ff1110a9 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Fri, 24 May 2024 21:41:02 +0200 Subject: [PATCH] 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 --- .../itest.bndrun | 16 ++++++++-------- .../itest.bndrun | 14 +++++++------- pom.xml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 40c3f96fdcd..b7722376f6f 100644 --- 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 245b4180480..a5239a24dea 100644 --- 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 b0bbaedeff3..6e5a9a98cca 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 7.0.0 3.9.0 2.2.1 - 2.16.0 + 2.17.1 5.14.0 4.4.6 4.1.104.Final