DPE-445 Build camel-cxf based on CXF 4.1.0 snapshot.

Jenkinsfile.talend

@@ -1,5 +1,5 @@
 @Library('esb') _
 
 Fork(
-        MVN_MODULES: 'org.apache.camel:camel-support,org.apache.camel:camel-cxf-soap,org.apache.camel:camel-cxf-rest,org.apache.camel:camel-spring'
+        MVN_MODULES: 'org.apache.camel:camel-support,org.apache.camel:camel-cxf-common,org.apache.camel:camel-cxf-soap,org.apache.camel:camel-cxf-rest,org.apache.camel:camel-cxf-transport,org.apache.camel:camel-cxf-spring-common,org.apache.camel:camel-cxf-spring-soap,org.apache.camel:camel-cxf-spring-rest,org.apache.camel:camel-cxf-spring-transport,org.apache.camel:camel-spring'
 )

components/camel-cxf/camel-cxf-common/pom.xml

@@ -28,14 +28,14 @@
 
     <artifactId>camel-cxf-common</artifactId>
     <packaging>jar</packaging>
+    <version>${revision}</version>
 
     <name>Camel :: CXF :: Common</name>
     <description>Camel CXF Common</description>
 
     <properties>
-
+        <revision>${camel-cxf.tesb.version}</revision>
         <camel-prepare-component>false</camel-prepare-component>
-
     </properties>
 
     <dependencies>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
         <dependency>

components/camel-cxf/camel-cxf-rest/pom.xml

@@ -66,17 +66,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-logging</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
 
@@ -122,14 +122,14 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-clustering</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-undertow</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -188,7 +188,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

components/camel-cxf/camel-cxf-rest/src/generated/resources/META-INF/org/apache/camel/component/cxf/jaxrs/cxfrs.json

@@ -12,7 +12,7 @@
     "metadata": { "protocol": "http" },
     "groupId": "org.apache.camel",
     "artifactId": "camel-cxf-rest",
-    "version": "4.8.1-SNAPSHOT",
+    "version": "4.8.1.20240820",
     "scheme": "cxfrs",
     "extendsScheme": "",
     "syntax": "cxfrs:beanId:address",

components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java

@@ -25,6 +25,7 @@
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
+import org.apache.camel.component.cxf.jaxrs.testbean.ICustomerService;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.cxf.endpoint.Server;
@@ -42,7 +43,7 @@ public void configure() {
                 CxfRsEndpoint endpoint = new CxfRsEndpoint();
                 endpoint.setAddress("http://localhost:8000");
                 endpoint.setCamelContext(context);
-                endpoint.setResourceClasses(CustomerService.class);
+                endpoint.setResourceClasses(ICustomerService.class);
                 endpoint.setEndpointUriIfNotSpecified("cxfrs:simple");
                 endpoint.setCxfRsConfigurer(new MyCxfRsConfigurer());
 

components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java

@@ -35,7 +35,7 @@
 import org.apache.cxf.common.util.StringUtils;
 
 @Path("/customerservice/")
-public class CustomerService {
+public class CustomerService implements ICustomerService {
     private final AtomicLong currentId = new AtomicLong(123L);
     private final Map<Long, Customer> customers = new ConcurrentHashMap<>();
     private final Map<Long, Order> orders = new ConcurrentHashMap<>();

components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/ICustomerService.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs.testbean;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+
+@Path("/customerservice/")
+public interface ICustomerService {
+
+    @GET
+    @Path("/customers/{id}/")
+    public Customer getCustomer(@PathParam("id") String id);
+}

components/camel-cxf/camel-cxf-soap/pom.xml

@@ -70,18 +70,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-logging</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
 
@@ -127,21 +132,21 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-clustering</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-undertow</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -167,7 +172,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
         <dependency>
@@ -180,22 +185,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <!-- this dependency is just for testing -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -261,6 +266,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${cxf.tesb.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>

components/camel-cxf/camel-cxf-soap/src/generated/resources/META-INF/org/apache/camel/component/cxf/jaxws/cxf.json

@@ -12,7 +12,7 @@
     "metadata": { "protocol": "http" },
     "groupId": "org.apache.camel",
     "artifactId": "camel-cxf-soap",
-    "version": "4.8.1-SNAPSHOT",
+    "version": "4.8.1.20240820",
     "scheme": "cxf",
     "extendsScheme": "",
     "syntax": "cxf:beanId:address",

components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java

@@ -139,7 +139,8 @@ public void schemaValidationEnabledServerTest() throws Exception {
             invokeService(serviceAddressValidationEnabled, RandomStringUtils.random(40, true, true));
             fail("expect a Validation exception here");
         } catch (SOAPFaultException e) {
-            assertEquals("the length of the value is 40, but the required maximum is 30.", e.getMessage(), "");
+            assertEquals("Schema validation error on message from client: the length of the value is 40, but the required maximum is 30..",
+                    e.getMessage(), "");
         }
     }
 

components/camel-cxf/camel-cxf-spring-common/pom.xml

@@ -28,14 +28,14 @@
 
     <artifactId>camel-cxf-spring-common</artifactId>
     <packaging>jar</packaging>
+    <version>${revision}</version>
 
     <name>Camel :: CXF :: Common :: Spring</name>
     <description>Camel CXF Spring Common</description>
 
     <properties>
-
+        <revision>${camel-cxf.tesb.version}</revision>
         <camel-prepare-component>false</camel-prepare-component>
-
     </properties>
 
     <dependencies>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
         </dependency>
 
         <dependency>

components/camel-cxf/camel-cxf-spring-rest/pom.xml

@@ -28,11 +28,13 @@
 
     <artifactId>camel-cxf-spring-rest</artifactId>
     <packaging>jar</packaging>
+    <version>${revision}</version>
 
     <name>Camel :: CXF :: REST :: Spring</name>
     <description>Camel CXF REST Spring support</description>
 
     <properties>
+        <revision>${camel-cxf.tesb.version}</revision>
         <firstVersion>3.18.0</firstVersion>
         <camel.surefire.fork.vmargs>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</camel.surefire.fork.vmargs>
         <camel.surefire.forkTimeout>300</camel.surefire.forkTimeout>
@@ -108,21 +110,21 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-clustering</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-undertow</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -161,7 +163,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -202,7 +204,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>${cxf-version}</version>
+            <version>${cxf.tesb.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>