From bfbcce54494c55dbe821fcb79fef2cf15239ceec Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Tue, 19 Aug 2025 22:41:33 +0200
Subject: [PATCH] Upgrade cxf to 3.6.8 (#4950)

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>
---
 bom/runtime/pom.xml                                |  2 +-
 .../karaf/openhab-tp/src/main/feature/feature.xml  | 14 +++++++-------
 .../itest.bndrun                                   | 12 ++++++------
 pom.xml                                            |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 8d70407f1..a819a593e 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -18,7 +18,7 @@
   <properties>
     <californium.version>4.0.0-M2</californium.version>
     <!-- cxf can be updated independently of karaf, only used in karaf tests -->
-    <cxf.version>3.6.5</cxf.version>
+    <cxf.version>3.6.8</cxf.version>
     <jackson.version>2.19.2</jackson.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <pax.logging.version>2.3.0</pax.logging.version>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 4c811e877..a3d966155 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -117,7 +117,7 @@
 	</feature>
 
 	<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
-		<capability>openhab.tp;feature=cxf;version=3.6.5</capability>
+		<capability>openhab.tp;feature=cxf;version=3.6.8</capability>
 		<feature dependency="true">openhab.tp-jaxws</feature>
 		<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.6.2</bundle>
 		<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
@@ -126,12 +126,12 @@
 		<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
 		<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
 		<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-core/3.6.5</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.5</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.5</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.5</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.5</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-core/3.6.8</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.8</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.8</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.8</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.8</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.8</bundle>
 	</feature>
 
 	<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
index 5ad2d816d..b27189ce7 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -46,12 +46,12 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	org.apache.cxf.cxf-core;version='[3.6.5,3.6.6)',\
-	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.5,3.6.6)',\
-	org.apache.cxf.cxf-rt-rs-client;version='[3.6.5,3.6.6)',\
-	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.5,3.6.6)',\
-	org.apache.cxf.cxf-rt-security;version='[3.6.5,3.6.6)',\
-	org.apache.cxf.cxf-rt-transports-http;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-core;version='[3.6.8,3.6.9)',\
+	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.8,3.6.9)',\
+	org.apache.cxf.cxf-rt-rs-client;version='[3.6.8,3.6.9)',\
+	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.8,3.6.9)',\
+	org.apache.cxf.cxf-rt-security;version='[3.6.8,3.6.9)',\
+	org.apache.cxf.cxf-rt-transports-http;version='[3.6.8,3.6.9)',\
 	org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
 	junit-jupiter-api;version='[5.11.4,5.11.5)',\
 	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
diff --git a/pom.xml b/pom.xml
index d8c3a9772..ca365753c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
 
     <!-- TEST -->
     <!-- cxf can be updated independently, karaf only uses it in tests -->
-    <cxf.version>3.6.5</cxf.version>
+    <cxf.version>3.6.8</cxf.version>
     <!-- junit 5.12.0 to 5.13.0-M3 fails silently with bnd 7.1.0, not executing itests;
          not sure if this is a bnd/junit issue or due to wrong configuration -->
     <junit.version>5.11.4</junit.version>