diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index f2d15535f..a5d0b3a74 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -19,8 +19,8 @@ 4.0.0-M2 3.6.9 - 2.20 - 2.20.1 + 2.21 + 2.21.0 9.4.57.v20241219 2.3.0 8.0.33 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index be7d739b8..fb9b6135b 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.20.1 - mvn:com.fasterxml.jackson.core/jackson-annotations/2.20 - mvn:com.fasterxml.jackson.core/jackson-core/2.20.1 - mvn:com.fasterxml.jackson.core/jackson-databind/2.20.1 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.20.1 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.20.1 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.20.1 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.20.1 - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.20.1 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.20.1 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.20.1 - mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.20.1 + openhab.tp;feature=jackson;version=2.21.0 + 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:org.codehaus.woodstox/stax2-api/4.2.2 mvn:org.yaml/snakeyaml/2.4 diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 518fc2236..0126d1e7d 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -78,9 +78,9 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' 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 a02da9e08..108e4c69c 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -78,9 +78,9 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' 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 4e3335f44..583948510 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -75,9 +75,9 @@ Fragment-Host: org.openhab.core.automation.module.script org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' 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 f98854f09..5412dcfd7 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -78,9 +78,9 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 67c25a2b9..2d60a945d 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -78,9 +78,9 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.semantics;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 88e0f01b2..4a2238af9 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -72,7 +72,7 @@ feature.openhab-config: \ org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.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)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 279508253..230e849d5 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -124,10 +124,10 @@ Fragment-Host: org.openhab.core.model.item org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)',\ 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 c9a2c1d4c..9cb441084 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -125,10 +125,10 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)',\ 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 538c1ebfe..5da0341e1 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -130,9 +130,9 @@ Fragment-Host: org.openhab.core.model.script org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index f85ad3f75..b76c0c180 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -132,10 +132,10 @@ Fragment-Host: org.openhab.core.model.thing org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)',\ 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 34313e43f..6a586616a 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -109,11 +109,11 @@ Fragment-Host: org.openhab.core.thing org.openhab.core.voice;version='[5.2.0,5.2.1)',\ 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.20.0,2.20.1)',\ - com.fasterxml.jackson.core.jackson-core;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.core.jackson-databind;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.20.1,2.20.2)',\ - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.20.1,2.20.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)',\ 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)',\ diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index 6666f9995..9465f8f7b 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -18,8 +18,8 @@ A tool for upgrading openHAB - 2.20 - 2.20.1 + 2.21 + 2.21.0