Skip to content

Commit 93ba5ad

Browse files
holgerfriedrichholgerfriedrich
committed
Bump jackson.version to 2.22.2 and stax2-api to 4.3.0
* Upgrade fasterxml.jackson from 2.21.4 to 2.22.2 * Upgrade fasterxml.jackson-annotations from 2.21 to 2.22 * Upgrade stax2-api from 4.2.2 to 4.3.0 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent e408807 commit 93ba5ad

13 files changed

Lines changed: 77 additions & 75 deletions

File tree

‎bom/runtime/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<californium.version>4.0.0-M2</californium.version>
2020
<!-- cxf can be updated independently of karaf, only used in karaf tests -->
2121
<cxf.version>3.6.10</cxf.version>
22-
<jackson.annotations.version>2.21</jackson.annotations.version>
23-
<jackson.version>2.21.4</jackson.version>
2422
<jetty.version>9.4.58.v20250814</jetty.version>
2523
<pax.logging.version>2.3.3</pax.logging.version>
2624
<pax.web.version>8.0.35</pax.web.version>
@@ -182,6 +180,13 @@
182180
<artifactId>woodstox-core</artifactId>
183181
<version>6.6.2</version>
184182
</dependency>
183+
<!-- pin stax2-api explicitly, otherwise woodstox-core's older transitive version wins
184+
mediation over jackson-dataformat-xml's required ${jackson.version.dep.stax2-api} -->
185+
<dependency>
186+
<groupId>org.codehaus.woodstox</groupId>
187+
<artifactId>stax2-api</artifactId>
188+
<version>4.3.0</version>
189+
</dependency>
185190

186191
<!-- JAX-RS 2.1 API with contract -->
187192
<dependency>

‎features/karaf/openhab-tp/src/main/feature/feature.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,20 @@
8484
</feature>
8585

8686
<feature name="openhab.tp-jackson" description="FasterXML Jackson bundles" version="${project.version}">
87-
<capability>openhab.tp;feature=jackson;version=2.21.4</capability>
88-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.21</bundle>
89-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.21.4</bundle>
90-
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.21.4</bundle>
91-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.4</bundle>
92-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.4</bundle>
93-
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.4</bundle>
94-
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.4</bundle>
95-
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.4</bundle>
96-
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.21.4</bundle>
97-
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.21.4</bundle>
98-
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.21.4</bundle>
87+
<capability>openhab.tp;feature=jackson;version=${jackson.version}</capability>
88+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
89+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
90+
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
91+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/${jackson.version}</bundle>
92+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
93+
<bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>
94+
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version}</bundle>
95+
<bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson.version}</bundle>
96+
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
97+
<bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
98+
<bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
9999
<!-- Transitive dependency of jackson-dataformat-xml -->
100-
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
100+
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.3.0</bundle>
101101
<!-- Transitive dependency of jackson-dataformat-yaml -->
102102
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.5</bundle>
103103
</feature>
@@ -130,7 +130,7 @@
130130
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
131131
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
132132
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
133-
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
133+
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.3.0</bundle>
134134
<bundle>mvn:org.apache.cxf/cxf-core/3.6.10</bundle>
135135
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.10</bundle>
136136
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.10</bundle>

‎itests/org.openhab.core.automation.integration.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ Fragment-Host: org.openhab.core.automation
7171
org.openhab.core.test;version='[5.3.0,5.3.1)',\
7272
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
7373
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
74-
stax2-api;version='[4.2.2,4.2.3)',\
74+
stax2-api;version='[4.3.0,4.3.1)',\
7575
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7676
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7777
org.openhab.core.semantics;version='[5.3.0,5.3.1)',\
7878
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7979
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
80-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
81-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
82-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
83-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
84-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
80+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
81+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
82+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
83+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
84+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
8585
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

‎itests/org.openhab.core.automation.module.core.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ Fragment-Host: org.openhab.core.automation
7171
org.openhab.core.test;version='[5.3.0,5.3.1)',\
7272
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
7373
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
74-
stax2-api;version='[4.2.2,4.2.3)',\
74+
stax2-api;version='[4.3.0,4.3.1)',\
7575
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7676
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7777
org.openhab.core.semantics;version='[5.3.0,5.3.1)',\
7878
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7979
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
80-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
81-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
82-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
83-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
84-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
80+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
81+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
82+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
83+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
84+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
8585
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

‎itests/org.openhab.core.automation.module.script.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ Fragment-Host: org.openhab.core.automation.module.script
6868
org.openhab.core.test;version='[5.3.0,5.3.1)',\
6969
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
7070
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
71-
stax2-api;version='[4.2.2,4.2.3)',\
71+
stax2-api;version='[4.3.0,4.3.1)',\
7272
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7373
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7474
org.openhab.core.semantics;version='[5.3.0,5.3.1)',\
7575
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7676
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
77-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
78-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
79-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
80-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
81-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
77+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
78+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
79+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
80+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
81+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
8282
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

‎itests/org.openhab.core.automation.module.timer.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ Fragment-Host: org.openhab.core.automation
7171
org.openhab.core.test;version='[5.3.0,5.3.1)',\
7272
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
7373
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
74-
stax2-api;version='[4.2.2,4.2.3)',\
74+
stax2-api;version='[4.3.0,4.3.1)',\
7575
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7676
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7777
org.openhab.core.semantics;version='[5.3.0,5.3.1)',\
7878
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7979
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
80-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
81-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
82-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
83-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
84-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
80+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
81+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
82+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
83+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
84+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
8585
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

‎itests/org.openhab.core.automation.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ Fragment-Host: org.openhab.core.automation
7171
org.openhab.core.test;version='[5.3.0,5.3.1)',\
7272
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
7373
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
74-
stax2-api;version='[4.2.2,4.2.3)',\
74+
stax2-api;version='[4.3.0,4.3.1)',\
7575
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7676
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7777
org.openhab.core.semantics;version='[5.3.0,5.3.1)',\
7878
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7979
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
80-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
81-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
82-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
83-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
84-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
80+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
81+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
82+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
83+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
84+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
8585
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

‎itests/org.openhab.core.ephemeris.tests/itest.bndrun‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ feature.openhab-config: \
6666
org.openhab.core.ephemeris;version='[5.3.0,5.3.1)',\
6767
org.openhab.core.ephemeris.tests;version='[5.3.0,5.3.1)',\
6868
org.openhab.core.test;version='[5.3.0,5.3.1)',\
69-
stax2-api;version='[4.2.2,4.2.3)',\
69+
stax2-api;version='[4.3.0,4.3.1)',\
7070
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
7171
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
7272
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
7373
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
74-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
75-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
76-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
77-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)'
74+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
75+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
76+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
77+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)'

‎itests/org.openhab.core.io.rest.core.tests/itest.bndrun‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ Fragment-Host: org.openhab.core.io.rest.core
9999
org.openhab.core.test;version='[5.3.0,5.3.1)',\
100100
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
101101
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
102-
stax2-api;version='[4.2.2,4.2.3)',\
102+
stax2-api;version='[4.3.0,4.3.1)',\
103103
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
104104
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
105105
org.openhab.core.sitemap;version='[5.3.0,5.3.1)',\
106-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
107-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
108-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
109-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
110-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
106+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
107+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
108+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
109+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
110+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
111111
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
112112
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
113113
org.openhab.core.automation;version='[5.3.0,5.3.1)',\

‎itests/org.openhab.core.model.rule.tests/itest.bndrun‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ Fragment-Host: org.openhab.core.model.rule.runtime
116116
org.openhab.core.thing;version='[5.3.0,5.3.1)',\
117117
org.openhab.core.transform;version='[5.3.0,5.3.1)',\
118118
org.openhab.core.voice;version='[5.3.0,5.3.1)',\
119-
stax2-api;version='[4.2.2,4.2.3)',\
119+
stax2-api;version='[4.3.0,4.3.1)',\
120120
com.google.guava;version='[33.6.0,33.6.1)',\
121121
biz.aQute.tester.junit-platform;version='[7.3.0,7.3.1)',\
122122
org.ops4j.pax.logging.pax-logging-api;version='[2.3.3,2.3.4)',\
123123
de.focus_shift.jollyday-core;version='[1.9.3,1.9.4)',\
124124
de.focus_shift.jollyday-jackson;version='[1.9.3,1.9.4)',\
125-
com.fasterxml.jackson.core.jackson-annotations;version='[2.21.0,2.21.1)',\
126-
com.fasterxml.jackson.core.jackson-core;version='[2.21.4,2.21.5)',\
127-
com.fasterxml.jackson.core.jackson-databind;version='[2.21.4,2.21.5)',\
128-
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.21.4,2.21.5)',\
129-
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.21.4,2.21.5)',\
130-
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'
125+
com.fasterxml.jackson.core.jackson-annotations;version='[2.22.0,2.22.1)',\
126+
com.fasterxml.jackson.core.jackson-core;version='[2.22.2,2.22.3)',\
127+
com.fasterxml.jackson.core.jackson-databind;version='[2.22.2,2.22.3)',\
128+
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.22.2,2.22.3)',\
129+
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.22.2,2.22.3)',\
130+
org.yaml.snakeyaml;version='[2.5.0,2.5.1)'

0 commit comments

Comments
 (0)