Skip to content

Commit 0146fda

Browse files
Upgrade cxf to 3.6.8
Upgrade cxf from 3.6.5 to 3.6.8 Find the list of relevant changes here: https://github.com/apache/cxf/blob/3.6.x-fixes/distribution/src/main/release/release_notes.txt Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent b8e3dd0 commit 0146fda

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

bom/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<californium.version>4.0.0-M2</californium.version>
2020
<!-- cxf can be updated independently of karaf, only used in karaf tests -->
21-
<cxf.version>3.6.5</cxf.version>
21+
<cxf.version>3.6.8</cxf.version>
2222
<jackson.version>2.19.2</jackson.version>
2323
<jetty.version>9.4.57.v20241219</jetty.version>
2424
<pax.logging.version>2.3.0</pax.logging.version>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</feature>
118118

119119
<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
120-
<capability>openhab.tp;feature=cxf;version=3.6.5</capability>
120+
<capability>openhab.tp;feature=cxf;version=3.6.8</capability>
121121
<feature dependency="true">openhab.tp-jaxws</feature>
122122
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.6.2</bundle>
123123
<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
@@ -126,12 +126,12 @@
126126
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
127127
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
128128
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
129-
<bundle>mvn:org.apache.cxf/cxf-core/3.6.5</bundle>
130-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.5</bundle>
131-
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.5</bundle>
132-
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.5</bundle>
133-
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.5</bundle>
134-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.5</bundle>
129+
<bundle>mvn:org.apache.cxf/cxf-core/3.6.8</bundle>
130+
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.8</bundle>
131+
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.8</bundle>
132+
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.8</bundle>
133+
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.8</bundle>
134+
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.8</bundle>
135135
</feature>
136136

137137
<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ Fragment-Host: org.openhab.core.io.rest.core
4646
org.osgi.service.event;version='[1.4.1,1.4.2)',\
4747
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
4848
com.google.gson;version='[2.11.0,2.11.1)',\
49-
org.apache.cxf.cxf-core;version='[3.6.5,3.6.6)',\
50-
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.5,3.6.6)',\
51-
org.apache.cxf.cxf-rt-rs-client;version='[3.6.5,3.6.6)',\
52-
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.5,3.6.6)',\
53-
org.apache.cxf.cxf-rt-security;version='[3.6.5,3.6.6)',\
54-
org.apache.cxf.cxf-rt-transports-http;version='[3.6.5,3.6.6)',\
49+
org.apache.cxf.cxf-core;version='[3.6.8,3.6.9)',\
50+
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.8,3.6.9)',\
51+
org.apache.cxf.cxf-rt-rs-client;version='[3.6.8,3.6.9)',\
52+
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.8,3.6.9)',\
53+
org.apache.cxf.cxf-rt-security;version='[3.6.8,3.6.9)',\
54+
org.apache.cxf.cxf-rt-transports-http;version='[3.6.8,3.6.9)',\
5555
org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
5656
junit-jupiter-api;version='[5.11.4,5.11.5)',\
5757
junit-jupiter-engine;version='[5.11.4,5.11.5)',\

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
<!-- TEST -->
8484
<!-- cxf can be updated independently, karaf only uses it in tests -->
85-
<cxf.version>3.6.5</cxf.version>
85+
<cxf.version>3.6.8</cxf.version>
8686
<!-- junit 5.12.0 to 5.13.0-M3 fails silently with bnd 7.1.0, not executing itests;
8787
not sure if this is a bnd/junit issue or due to wrong configuration -->
8888
<junit.version>5.11.4</junit.version>

0 commit comments

Comments
 (0)