diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 47277ed87..d4aed6685 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -20,7 +20,7 @@ 3.6.10 2.21 - 2.21.2 + 2.21.3 9.4.58.v20250814 2.3.3 8.0.35 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 1019296bd..598641c0d 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -84,18 +84,18 @@ - openhab.tp;feature=jackson;version=2.21.2 + openhab.tp;feature=jackson;version=2.21.3 mvn:com.fasterxml.jackson.core/jackson-annotations/2.21 - mvn:com.fasterxml.jackson.core/jackson-core/2.21.2 - mvn:com.fasterxml.jackson.core/jackson-databind/2.21.2 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.2 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.2 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.2 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.2 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.2 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.21.2 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.21.2 - mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.21.2 + mvn:com.fasterxml.jackson.core/jackson-core/2.21.3 + mvn:com.fasterxml.jackson.core/jackson-databind/2.21.3 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.3 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.3 + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.3 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.3 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.3 + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.21.3 + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.21.3 + mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.21.3 mvn:org.codehaus.woodstox/stax2-api/4.2.2 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 e8277be1c..d7c46a9d1 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 617b02457..d5de59395 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 60064f431..3c1cc1b5f 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 4c5fa0578..8bd1200c2 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 c77827259..133483aee 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 26d1db079..b58ab7192 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.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)' + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index add293dff..8e937b518 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -126,9 +126,9 @@ Fragment-Host: org.openhab.core.model.item de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 c9af7a37c..b8b3115b0 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -127,9 +127,9 @@ Fragment-Host: org.openhab.core.model.rule.runtime de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 8659709a8..414590d52 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -132,8 +132,8 @@ Fragment-Host: org.openhab.core.model.script de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 f11261e5e..0e700086d 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -134,9 +134,9 @@ Fragment-Host: org.openhab.core.model.thing de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\ de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ 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 752f73d0d..ade8737ea 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.2,2.21.3)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.2,2.21.3)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.2,2.21.3)',\ + com.fasterxml.jackson.core.jackson-core;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.core.jackson-databind;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.3,2.21.4)',\ + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.3,2.21.4)',\ com.google.guava;version='[33.6.0,33.6.1)',\ com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\ org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index e58735779..1f183b19a 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -19,7 +19,7 @@ 2.21 - 2.21.2 + 2.21.3