diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java index e93f3a524654..d3642b9d3bc5 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.cxf.soap.ssl.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusIntegrationTest class CxfSoapGlobalTrustedSslIT extends CxfSoapGlobalTrustedSslTest { } diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java index d6e0fb007cf9..8fccffa4becb 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java @@ -20,12 +20,10 @@ import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.equalTo; -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusTest @TestProfile(CxfSoapGlobalTrustedSslTest.class) public class CxfSoapGlobalTrustedSslTest implements QuarkusTestProfile { diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java index 37f0e2eacc7e..821865c6696f 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.cxf.soap.ssl.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusIntegrationTest class CxfSoapGlobalUntrustedSslIT extends CxfSoapGlobalUntrustedSslTest { } diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java index 1baf4692934f..d19ba9aaaa76 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java @@ -20,12 +20,10 @@ import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.containsString; -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusTest @TestProfile(CxfSoapGlobalUntrustedSslTest.class) public class CxfSoapGlobalUntrustedSslTest implements QuarkusTestProfile { diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java index 8548b2c0dabb..b8b5fc9bf15d 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.cxf.soap.ssl.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusIntegrationTest class CxfSoapSslIT extends CxfSoapSslTest { } diff --git a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java index cdbe9237bd8c..9e632978c5b1 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java @@ -20,14 +20,12 @@ import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; // Tests require restart of Quarkus to avoid persisting of global ssl context. -@Disabled("https://github.com/apache/camel-quarkus/issues/6294") @QuarkusTest @TestProfile(CxfSoapSslTest.class) public class CxfSoapSslTest implements QuarkusTestProfile { diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java index 73d246c26583..c5b7a2415465 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java @@ -32,7 +32,7 @@ import io.restassured.RestAssured; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Service; -import jakarta.xml.ws.WebServiceException; +import jakarta.xml.ws.soap.SOAPFaultException; import org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloService; import org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloWrongWS; import org.apache.cxf.ws.security.SecurityConstants; @@ -114,15 +114,8 @@ public void testWrongClientNotHanging() { try { //always fails because there is no server implementation createSayHelloWrongClient().sayHelloWrong("Sheldon"); - } catch (WebServiceException e) { - Throwable cause = e.getCause(); - if (cause != null) { - Throwable parentCause = cause.getCause(); - if (parentCause != null) { - return parentCause.getMessage() != null - && parentCause.getMessage().toLowerCase().contains("connection refused"); - } - } + } catch (SOAPFaultException e) { + return e.getMessage() != null && e.getMessage().toLowerCase().contains("connection refused"); } //can not happen (client does not work) return false; diff --git a/pom.xml b/pom.xml index c29027d4ed6d..4142bc6b90ef 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.16.0 3.3.0 - 3.13.0 + 3.13.1 1.0.0 3.12.1 2.0.2