Upgrade Quarkus CXF to 3.33.0

jamesnetherton · web-flow · commit b93dd04a570e · 2026-03-19T10:51:51.000Z
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/pom.xml b/integration-test-groups/cxf-soap/cxf-soap-server/pom.xml
@@ -69,6 +69,11 @@
             <artifactId>quarkus-cxf-test-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-test-util-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java
@@ -18,7 +18,7 @@
 
 import com.helloworld.service.HelloPortType;
 import com.helloworld.service.HelloService;
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -33,7 +33,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 
 @QuarkusTest
 class CxfSoapServiceTest {
@@ -79,7 +79,7 @@ public void codeFirstWsdl() {
 
     @Test
     public void codeFirstSoapService() {
-        final CodeFirstService client = QuarkusCxfClientTestUtil.getClient(CodeFirstService.TARGET_NS, CodeFirstService.class,
+        final CodeFirstService client = QuarkusCxfTestUtil.getClient(CodeFirstService.TARGET_NS, CodeFirstService.class,
                 "/soapservice/codefirst");
         Assertions.assertEquals("Hello Joe code first", client.hello("Joe"));
         Assertions.assertEquals("Good bye Laszlo code first", client.goodBye("Laszlo"));
@@ -88,21 +88,21 @@ public void codeFirstSoapService() {
     @ParameterizedTest
     @ValueSource(strings = { "raw", "cxf-message" })
     public void testCodeFirstSoapServiceDataFormats(String dataFormat) {
-        final TextService textService = QuarkusCxfClientTestUtil.getClient(TextService.class,
+        final TextService textService = QuarkusCxfTestUtil.getClient(TextService.class,
                 String.format("/soapservice/text-route-%s-data-format", dataFormat));
         assertTextService(textService, "Hello there from text service and " + dataFormat);
     }
 
     @Test
     public void echoServiceResponseFromRoute() {
-        final TextService textService = QuarkusCxfClientTestUtil.getClient(TextService.class,
+        final TextService textService = QuarkusCxfTestUtil.getClient(TextService.class,
                 "/soapservice/text-service-route");
         assertTextService(textService, "Hello there from text service route!");
     }
 
     @Test
     public void echoServiceResponseFromImpl() {
-        final TextService textService = QuarkusCxfClientTestUtil.getClient(TextService.class, "/soapservice/text-service-impl");
+        final TextService textService = QuarkusCxfTestUtil.getClient(TextService.class, "/soapservice/text-service-impl");
         assertTextService(textService, "Hello there from text service impl!");
     }
 
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/pom.xml b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>quarkus-cxf-test-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-test-util-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/securitypolicy/server/cxf/way/it/CxfWssSecurityPolicyServerCxfWayTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/securitypolicy/server/cxf/way/it/CxfWssSecurityPolicyServerCxfWayTest.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.config.RestAssuredConfig;
@@ -31,7 +31,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 import static io.restassured.RestAssured.given;
 
 @QuarkusTest
@@ -76,7 +76,7 @@ void unencryptedUnsigned() throws IOException {
 
         given()
                 .body(SOAP_REQUEST)
-                .when().post(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()))
+                .when().post(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()))
                 .then()
                 .statusCode(500)
                 .body(
@@ -178,7 +178,7 @@ void fakeSigned() throws IOException {
 
         given()
                 .body(SOAP_REQUEST)
-                .when().post(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()))
+                .when().post(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()))
                 .then()
                 .statusCode(500)
                 .body(
@@ -195,7 +195,7 @@ void wsdl() {
         config.getXmlConfig().namespaceAware(false);
         given()
                 .config(config)
-                .when().get(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()) + "?wsdl")
+                .when().get(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()) + "?wsdl")
                 .then()
                 .statusCode(200)
                 .body(
@@ -206,7 +206,7 @@ void wsdl() {
     }
 
     WssSecurityPolicyHelloServiceCxfWay getPlainClient() {
-        return QuarkusCxfClientTestUtil.getClient(
+        return QuarkusCxfTestUtil.getClient(
                 "https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/ws-securitypolicy",
                 WssSecurityPolicyHelloServiceCxfWay.class,
                 "/soapservice/security-policy-hello-cxf-way");
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/securitypolicy/server/it/CxfWssSecurityPolicyServerTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/securitypolicy/server/it/CxfWssSecurityPolicyServerTest.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.config.RestAssuredConfig;
@@ -30,7 +30,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 import static io.restassured.RestAssured.given;
 
 @QuarkusTest
@@ -75,7 +75,7 @@ void unencryptedUnsigned() throws IOException {
 
         given()
                 .body(SOAP_REQUEST)
-                .when().post(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()))
+                .when().post(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()))
                 .then()
                 .statusCode(500)
                 .body(
@@ -177,7 +177,7 @@ void fakeSigned() throws IOException {
 
         given()
                 .body(SOAP_REQUEST)
-                .when().post(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()))
+                .when().post(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()))
                 .then()
                 .statusCode(500)
                 .body(
@@ -194,7 +194,7 @@ void wsdl() {
         config.getXmlConfig().namespaceAware(false);
         given()
                 .config(config)
-                .when().get(QuarkusCxfClientTestUtil.getEndpointUrl(getPlainClient()) + "?wsdl")
+                .when().get(QuarkusCxfTestUtil.getEndpointUrl(getPlainClient()) + "?wsdl")
                 .then()
                 .statusCode(200)
                 .body(
@@ -205,7 +205,7 @@ void wsdl() {
     }
 
     WssSecurityPolicyHelloService getPlainClient() {
-        return QuarkusCxfClientTestUtil.getClient(
+        return QuarkusCxfTestUtil.getClient(
                 "https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/ws-securitypolicy",
                 WssSecurityPolicyHelloService.class,
                 "/soapservice/security-policy-hello");
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/server/it/CxfSoapWssServerTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/server/it/CxfSoapWssServerTest.java
@@ -24,7 +24,7 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -39,7 +39,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 
 @QuarkusTest
 @QuarkusTestResource(value = CxfWssServerTestResource.class)
@@ -90,7 +90,7 @@ void usernameTokenBadPassword() throws IOException {
     }
 
     static WssRounderService rounderClient(String username, String password) {
-        final WssRounderService client = QuarkusCxfClientTestUtil.getClient(WssRounderService.class, "/soapservice/rounder");
+        final WssRounderService client = QuarkusCxfTestUtil.getClient(WssRounderService.class, "/soapservice/rounder");
 
         final CallbackHandler passwordCallback = new CallbackHandler() {
             @Override
@@ -117,7 +117,7 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallback
 
     @Test
     void anonymous() throws IOException {
-        final WssRounderService client = QuarkusCxfClientTestUtil.getClient(WssRounderService.class, "/soapservice/rounder");
+        final WssRounderService client = QuarkusCxfTestUtil.getClient(WssRounderService.class, "/soapservice/rounder");
         /* Make sure that it fails properly when called without a password */
         Assertions.assertThatExceptionOfType(jakarta.xml.ws.soap.SOAPFaultException.class)
                 .isThrownBy(() -> client.round(2.8))
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-trust/pom.xml b/integration-test-groups/cxf-soap/cxf-soap-ws-trust/pom.xml
@@ -65,6 +65,11 @@
             <artifactId>quarkus-cxf-test-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-test-util-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/ws/trust/CxfWsTrustTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/ws/trust/CxfWsTrustTest.java
@@ -21,7 +21,7 @@
 
 import javax.xml.namespace.QName;
 
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.config.RestAssuredConfig;
@@ -38,7 +38,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 import static io.restassured.RestAssured.given;
 
 @QuarkusTest
@@ -100,7 +100,7 @@ public void programmaticSts() throws Exception {
             final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
             final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
 
-            String stsURL = QuarkusCxfClientTestUtil.getServerUrl()
+            String stsURL = QuarkusCxfTestUtil.getServerUrl()
                     + "/soapservice/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl";
             setupWsseAndSTSClient(proxy, bus, stsURL, stsServiceName, stsPortName);
 
@@ -120,7 +120,7 @@ public void programmaticStsNotSet() throws Exception {
     TrustHelloService trustHelloService() throws Exception {
         final QName serviceName = new QName("https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/test/ws-trust",
                 "TrustHelloService");
-        final URL wsdlURL = new URL(io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.getServerUrl()
+        final URL wsdlURL = new URL(io.quarkiverse.cxf.test.QuarkusCxfTestUtil.getServerUrl()
                 + "/soapservice/jaxws-samples-wsse-policy-trust/TrustHelloService?wsdl");
         Service service = Service.create(wsdlURL, serviceName);
         return (TrustHelloService) service.getPort(TrustHelloService.class);
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/ws/trust/cxf/way/CxfWsTrustCxfWayTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-trust/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/ws/trust/cxf/way/CxfWsTrustCxfWayTest.java
@@ -21,7 +21,7 @@
 
 import javax.xml.namespace.QName;
 
-import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
+import io.quarkiverse.cxf.test.QuarkusCxfTestUtil;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.config.RestAssuredConfig;
@@ -38,7 +38,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
+import static io.quarkiverse.cxf.test.internal.QuarkusCxfInternalTestUtil.anyNs;
 import static io.restassured.RestAssured.given;
 
 @QuarkusTest
@@ -97,15 +97,15 @@ public void programmaticSts() throws Exception {
 
             final QName serviceName = new QName("https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/test/ws-trust",
                     "TrustHelloServiceCxfWay");
-            final URL wsdlURL = new URL(io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.getServerUrl()
+            final URL wsdlURL = new URL(io.quarkiverse.cxf.test.QuarkusCxfTestUtil.getServerUrl()
                     + "/soapservice/jaxws-samples-wsse-policy-trust-cxf-way/TrustHelloServiceCxfWay?wsdl");
             Service service = Service.create(wsdlURL, serviceName);
             TrustHelloServiceCxfWay proxy = service.getPort(TrustHelloServiceCxfWay.class);
 
             final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SecurityTokenService");
             final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UT_Port");
 
-            String stsURL = QuarkusCxfClientTestUtil.getServerUrl()
+            String stsURL = QuarkusCxfTestUtil.getServerUrl()
                     + "/soapservice/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl";
             setupWsseAndSTSClient(proxy, bus, stsURL, stsServiceName, stsPortName);
 
diff --git a/integration-tests/cxf-soap-grouped/pom.xml b/integration-tests/cxf-soap-grouped/pom.xml
@@ -99,6 +99,11 @@
             <artifactId>quarkus-cxf-test-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-test-util-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
         <quarkiverse-amazonservices.version>3.15.1</quarkiverse-amazonservices.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/ -->
         <quarkiverse-artemis.version>3.12.2</quarkiverse-artemis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/ -->
         <quarkiverse-batik.version>1.1.0</quarkiverse-batik.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/batik/quarkus-batik-parent/ -->
-        <quarkiverse-cxf.version>3.32.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
+        <quarkiverse-cxf.version>3.33.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
         <quarkiverse-freemarker.version>1.3.0</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-fory.version>0.5.0</quarkiverse-fory.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/fury/quarkus-fury-parent/ -->
         <quarkiverse-groovy.version>3.32.3</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
