This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c8921cfcef0e CAMEL-23057 Upgrade cxf to 4.2.0; upgrade undertow to
2.4.0.alpha (#21580)
c8921cfcef0e is described below
commit c8921cfcef0eec1afa9e963a8a2a1b6b905428b3
Author: Tom Cunningham <[email protected]>
AuthorDate: Mon Feb 23 12:36:57 2026 -0500
CAMEL-23057 Upgrade cxf to 4.2.0; upgrade undertow to 2.4.0.alpha (#21580)
* CAMEL-23057 Upgrade cxf to 4.2.0; upgrade undertow to 2.4.0.alpha
* Remove camel-test-infra-all from detect-test.sh (CI can't find it on PRs)
---
.github/actions/detect-dependencies/detect-test.sh | 2 +-
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 11 +++++++++--
.../resources/org/apache/camel/component/cxf/wsrm/ws_rm.xml | 2 +-
.../camel/component/cxf/wssecurity/camel/camel-context.xml | 2 +-
.../apache/camel/component/cxf/wssecurity/client/wssec.xml | 2 +-
.../apache/camel/component/cxf/wssecurity/server/wssec.xml | 2 +-
components/camel-elytron/pom.xml | 4 ++--
components/camel-oauth/pom.xml | 4 ++--
components/camel-servlet/pom.xml | 4 ++--
components/camel-undertow/pom.xml | 4 ++--
parent/pom.xml | 7 ++++---
11 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/.github/actions/detect-dependencies/detect-test.sh
b/.github/actions/detect-dependencies/detect-test.sh
index c58edbfaef34..dcdb3a9e218f 100755
--- a/.github/actions/detect-dependencies/detect-test.sh
+++ b/.github/actions/detect-dependencies/detect-test.sh
@@ -66,7 +66,7 @@ main() {
echo "Using MVND_OPTS=$MVND_OPTS"
local base_branch=${1}
local mavenBinary=${2}
- local
exclusionList="!:camel-allcomponents,!:dummy-component,!:camel-catalog,!:camel-catalog-console,!:camel-catalog-lucene,!:camel-catalog-maven,!:camel-catalog-suggest,!:camel-route-parser,!:camel-csimple-maven-plugin,!:camel-report-maven-plugin,!:camel-endpointdsl,!:camel-componentdsl,!:camel-endpointdsl-support,!:camel-yaml-dsl,!:camel-kamelet-main,!:camel-yaml-dsl-deserializers,!:camel-yaml-dsl-maven-plugin,!:camel-jbang-core,!:camel-jbang-main,!:camel-jbang-plugin-generate,!:came
[...]
+ local
exclusionList="!:camel-allcomponents,!:dummy-component,!:camel-catalog,!:camel-catalog-console,!:camel-catalog-lucene,!:camel-catalog-maven,!:camel-catalog-suggest,!:camel-route-parser,!:camel-csimple-maven-plugin,!:camel-report-maven-plugin,!:camel-endpointdsl,!:camel-componentdsl,!:camel-endpointdsl-support,!:camel-yaml-dsl,!:camel-kamelet-main,!:camel-yaml-dsl-deserializers,!:camel-yaml-dsl-maven-plugin,!:camel-jbang-core,!:camel-jbang-main,!:camel-jbang-plugin-generate,!:came
[...]
git fetch origin $base_branch:$base_branch
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index dc1dd3b5b918..85ffea510594 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -146,9 +146,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.undertow</groupId>
+ <groupId>io.undertow.ee</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>${undertow-version}</version>
+ <version>${undertow-ee-version}</version>
<scope>test</scope>
</dependency>
@@ -180,6 +180,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wsrm/ws_rm.xml
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wsrm/ws_rm.xml
index cb8f440a0f8d..96e5b0554894 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wsrm/ws_rm.xml
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wsrm/ws_rm.xml
@@ -35,7 +35,7 @@
<cxf:bus>
<cxf:features>
- <cxf:logging/>
+ <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
<wsa:addressing/>
<wsrm-mgr:reliableMessaging>
<wsrm-policy:RMAssertion>
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
index 089a72d4410e..0ea926fcbbd1 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
@@ -22,7 +22,7 @@
<cxf-core:bus>
<cxf-core:features>
- <cxf-core:logging/>
+ <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf-core:features>
</cxf-core:bus>
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
index ca778463beb4..e66928cd555d 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
@@ -38,7 +38,7 @@
<cxf:bus>
<cxf:features>
- <cxf:logging/>
+ <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf:features>
</cxf:bus>
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
index 1dbd15bc7235..ac3c1e46f89b 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
@@ -38,7 +38,7 @@
<cxf:bus>
<cxf:features>
- <cxf:logging/>
+ <bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf:features>
</cxf:bus>
diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml
index 990caaaedb62..8a55c5b236a9 100644
--- a/components/camel-elytron/pom.xml
+++ b/components/camel-elytron/pom.xml
@@ -64,9 +64,9 @@
<version>${elytron-web}</version>
</dependency>
<dependency>
- <groupId>io.undertow</groupId>
+ <groupId>io.undertow.ee</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>${undertow-version}</version>
+ <version>${undertow-ee-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
diff --git a/components/camel-oauth/pom.xml b/components/camel-oauth/pom.xml
index 4ab538b3595f..42b492a6bce6 100644
--- a/components/camel-oauth/pom.xml
+++ b/components/camel-oauth/pom.xml
@@ -92,9 +92,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.undertow</groupId>
+ <groupId>io.undertow.ee</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>${undertow-version}</version>
+ <version>${undertow-ee-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 2c5a2f9b8872..0b3b6d3a4717 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -107,9 +107,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.undertow</groupId>
+ <groupId>io.undertow.ee</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>${undertow-version}</version>
+ <version>${undertow-ee-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-undertow/pom.xml
b/components/camel-undertow/pom.xml
index 5c7e38d367c0..1b330d1acaf5 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -62,9 +62,9 @@
<version>${undertow-version}</version>
</dependency>
<dependency>
- <groupId>io.undertow</groupId>
+ <groupId>io.undertow.ee</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>${undertow-version}</version>
+ <version>${undertow-ee-version}</version>
</dependency>
<!-- testing -->
diff --git a/parent/pom.xml b/parent/pom.xml
index e0338820bd28..15838a3cb5df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -135,8 +135,8 @@
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<couchbase-client-version>3.11.1</couchbase-client-version>
<curator-version>5.9.0</curator-version>
- <cxf-version>4.1.4</cxf-version>
- <cxf-codegen-plugin-version>4.1.4</cxf-codegen-plugin-version>
+ <cxf-version>4.2.0</cxf-version>
+ <cxf-codegen-plugin-version>4.2.0</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
<cxf-xjc-plugin-version>4.1.2</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>4.1.2</cxf-xjc-utils-version>
@@ -539,7 +539,8 @@
<tika-version>3.2.3</tika-version>
<twilio-version>11.3.4</twilio-version>
<twitter4j-version>4.1.2</twitter4j-version>
- <undertow-version>2.3.23.Final</undertow-version>
+ <undertow-version>2.4.0.Alpha1</undertow-version>
+ <undertow-ee-version>2.0.0.Alpha2</undertow-ee-version>
<univocity-parsers-version>2.10.2</univocity-parsers-version>
<validation-api-version>2.0.1.Final</validation-api-version>
<vavr-version>1.0.0</vavr-version>
