From 3108cd998485dfcf865ac577905aeac1142cc170 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sat, 28 Feb 2026 18:04:49 +0100
Subject: [PATCH] Upgrade cxf to 3.6.10 (#5380)

* Upgrade cxf to 3.6.10

Upgrade cxf from 3.6.9 to 3.6.10

Find the list of relevant changes here:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12356395

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 17e6ff391..2c59fcff3 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.9</cxf.version>
+    <cxf.version>3.6.10</cxf.version>
     <jackson.annotations.version>2.21</jackson.annotations.version>
     <jackson.version>2.21.0</jackson.version>
     <jetty.version>9.4.58.v20250814</jetty.version>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 83ca48793..f456419b6 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -120,7 +120,7 @@
 	</feature>
 
 	<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
-		<capability>openhab.tp;feature=cxf;version=3.6.9</capability>
+		<capability>openhab.tp;feature=cxf;version=3.6.10</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>
@@ -129,12 +129,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.9</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.9</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.9</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.9</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.9</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.9</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-core/3.6.10</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.10</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.10</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.10</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.10</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.10</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 d90af8dfa..9f32fcee8 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.13.2,2.13.3)',\
-	org.apache.cxf.cxf-core;version='[3.6.9,3.6.10)',\
-	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.9,3.6.10)',\
-	org.apache.cxf.cxf-rt-rs-client;version='[3.6.9,3.6.10)',\
-	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.9,3.6.10)',\
-	org.apache.cxf.cxf-rt-security;version='[3.6.9,3.6.10)',\
-	org.apache.cxf.cxf-rt-transports-http;version='[3.6.9,3.6.10)',\
+	org.apache.cxf.cxf-core;version='[3.6.10,3.6.11)',\
+	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.10,3.6.11)',\
+	org.apache.cxf.cxf-rt-rs-client;version='[3.6.10,3.6.11)',\
+	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.10,3.6.11)',\
+	org.apache.cxf.cxf-rt-security;version='[3.6.10,3.6.11)',\
+	org.apache.cxf.cxf-rt-transports-http;version='[3.6.10,3.6.11)',\
 	org.apache.ws.xmlschema.core;version='[2.3.2,2.3.3)',\
 	junit-jupiter-api;version='[5.14.2,5.14.3)',\
 	junit-jupiter-engine;version='[5.14.2,5.14.3)',\
diff --git a/pom.xml b/pom.xml
index b0ffe3598..b3cd6e804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
 
     <!-- TEST -->
     <!-- cxf can be updated independently, karaf only uses it in tests -->
-    <cxf.version>3.6.9</cxf.version>
+    <cxf.version>3.6.10</cxf.version>
     <junit.version>5.14.2</junit.version>
     <mockito.version>5.21.0</mockito.version>
   </properties>