You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2023/10/04 14:17:30 UTC

[camel] branch camel-4.0.x updated: [CAMEL-19935]upgrade to CXF 4.0.3

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.0.x by this push:
     new db8f65b8350 [CAMEL-19935]upgrade to CXF 4.0.3
db8f65b8350 is described below

commit db8f65b83503c3a81ddbd60457548b7acf4d586f
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Oct 3 16:10:56 2023 -0400

    [CAMEL-19935]upgrade to CXF 4.0.3
    
    (cherry picked from commit 49eda4f5a402f6865260984c62f7c5b732ed5004)
---
 .../java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java  | 6 +++---
 .../src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java   | 2 +-
 parent/pom.xml                                                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 33af8e8dbfd..6fed84b0eea 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -136,17 +136,17 @@ public class CxfProducerTest {
     public void testInvokingAWrongServer() throws Exception {
         Exchange reply = sendSimpleMessage(getWrongEndpointUri());
         assertNotNull(reply.getException(), "We should get the exception here");
-        assertTrue(reply.getException() instanceof ConnectException);
+        assertTrue(reply.getException().getCause() instanceof ConnectException);
 
         //Test the data format PAYLOAD
         reply = sendSimpleMessageWithPayloadMessage(getWrongEndpointUri() + "&dataFormat=PAYLOAD");
         assertNotNull(reply.getException(), "We should get the exception here");
-        assertTrue(reply.getException() instanceof ConnectException);
+        assertTrue(reply.getException().getCause() instanceof ConnectException);
 
         //Test the data format MESSAGE
         reply = sendSimpleMessageWithRawMessage(getWrongEndpointUri() + "&dataFormat=RAW");
         assertNotNull(reply.getException(), "We should get the exception here");
-        assertTrue(reply.getException() instanceof ConnectException);
+        assertTrue(reply.getException().getCause() instanceof ConnectException);
     }
 
     @Test
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
index 27d22d99e73..952942ea706 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
@@ -73,7 +73,7 @@ public class SslTest extends CamelSpringTestSupport {
     public void testInvokingNoTrustRoute() throws Exception {
         Exchange reply = sendJaxWsMessage("direct:noTrust");
         assertTrue(reply.isFailed(), "We expect the exception here");
-        Throwable e = reply.getException();
+        Throwable e = reply.getException().getCause();
         assertEquals("javax.net.ssl.SSLHandshakeException", e.getClass().getCanonicalName());
     }
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 907f8366ec4..239ad3a1981 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,8 +115,8 @@
         <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
         <couchbase-client-version>3.4.9</couchbase-client-version>
         <curator-version>5.5.0</curator-version>
-        <cxf-version>4.0.2</cxf-version>
-        <cxf-codegen-plugin-version>4.0.2</cxf-codegen-plugin-version>
+        <cxf-version>4.0.3</cxf-version>
+        <cxf-codegen-plugin-version>4.0.3</cxf-codegen-plugin-version>
         <!-- cxf-xjc is not released as often -->
         <cxf-xjc-plugin-version>4.0.0</cxf-xjc-plugin-version>
         <cxf-xjc-utils-version>4.0.0</cxf-xjc-utils-version>