From a252737930f391665320659f3e29dafec9ad86be Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Mon, 2 Mar 2026 17:16:48 +0100 Subject: [PATCH] Upgrade Jackson to 2.21.1 (#5394) * Upgrade Jackson from 2.21.0 to 2.21.1 * Upgrade snakeyaml from 2.4 to 2.5 Signed-off-by: Holger Friedrich --- bom/runtime/pom.xml | 2 +- .../openhab-tp/src/main/feature/feature.xml | 24 +++++++++---------- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 6 ++--- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../itest.bndrun | 10 ++++---- .../org.openhab.core.thing.tests/itest.bndrun | 10 ++++---- 13 files changed, 66 insertions(+), 66 deletions(-) diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 2c59fcff3..26d130f05 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -20,7 +20,7 @@ 3.6.10 2.21 - 2.21.0 + 2.21.1 9.4.58.v20250814 2.3.2 8.0.34 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index f456419b6..0174accc0 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -84,20 +84,20 @@ - openhab.tp;feature=jackson;version=2.21.0 + openhab.tp;feature=jackson;version=2.21.1 mvn:com.fasterxml.jackson.core/jackson-annotations/2.21 - mvn:com.fasterxml.jackson.core/jackson-core/2.21.0 - mvn:com.fasterxml.jackson.core/jackson-databind/2.21.0 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.0 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.0 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.0 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.0 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.0 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.21.0 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.21.0 - mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.21.0 + mvn:com.fasterxml.jackson.core/jackson-core/2.21.1 + mvn:com.fasterxml.jackson.core/jackson-databind/2.21.1 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.1 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.1 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.1 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.1 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.1 + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.21.1 + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.21.1 + mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.21.1 mvn:org.codehaus.woodstox/stax2-api/4.2.2 - mvn:org.yaml/snakeyaml/2.4 + mvn:org.yaml/snakeyaml/2.5 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index f6bf144b1..e21ff2341 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 82c80c859..65ea5c6d4 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 8c3444db5..0c5b4e783 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -76,8 +76,8 @@ Fragment-Host: org.openhab.core.automation.module.script de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 78deb4d3d..e6dd0d28a 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 5a410e3cd..a664ba31a 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -79,8 +79,8 @@ Fragment-Host: org.openhab.core.automation de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 78957462e..b26f9dc55 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -73,6 +73,6 @@ feature.openhab-config: \ de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 7556f85de..5824ea685 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -125,9 +125,9 @@ Fragment-Host: org.openhab.core.model.item de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 340022445..48715f9bf 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -126,9 +126,9 @@ Fragment-Host: org.openhab.core.model.rule.runtime de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index c4933e513..a86639698 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -131,8 +131,8 @@ Fragment-Host: org.openhab.core.model.script de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 3da8eae4f..761303e88 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -133,9 +133,9 @@ Fragment-Host: org.openhab.core.model.thing de.focus_shift.jollyday-core;version='[1.8.1,1.8.2)',\ de.focus_shift.jollyday-jackson;version='[1.8.1,1.8.2)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ + org.yaml.snakeyaml;version='[2.5.0,2.5.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index f11c4006f..a013c4778 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -110,10 +110,10 @@ Fragment-Host: org.openhab.core.thing org.threeten.extra;version='[1.8.0,1.8.1)',\ stax2-api;version='[4.2.2,4.2.3)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.0,2.21.1)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.1,2.21.2)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.1,2.21.2)',\ com.google.guava;version='[33.5.0,33.5.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ @@ -134,4 +134,4 @@ Fragment-Host: org.openhab.core.thing org.ops4j.pax.web.pax-web-runtime;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-spi;version='[8.0.34,8.0.35)',\ org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.34,8.0.35)',\ - org.yaml.snakeyaml;version='[2.4.0,2.4.1)' + org.yaml.snakeyaml;version='[2.5.0,2.5.1)'