From 995c74a8e0268add3b8b4696dd767e7995d825ed Mon Sep 17 00:00:00 2001
From: Zheng Feng <zh.feng@gmail.com>
Date: Fri, 20 Jan 2023 12:32:35 +0800
Subject: [PATCH] Fix #4122 to use io.quarkiverse.cxf:quarkus-cxf-saaj

---
 extensions/soap/deployment/pom.xml            |  4 +++
 .../soap/deployment/SoapProcessor.java        | 27 -------------------
 extensions/soap/runtime/pom.xml               |  4 +++
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/extensions/soap/deployment/pom.xml b/extensions/soap/deployment/pom.xml
index 9032bbfc339f..220f57f8461b 100644
--- a/extensions/soap/deployment/pom.xml
+++ b/extensions/soap/deployment/pom.xml
@@ -38,6 +38,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-jaxb-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-saaj-deployment</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/soap/deployment/src/main/java/org/apache/camel/quarkus/component/soap/deployment/SoapProcessor.java b/extensions/soap/deployment/src/main/java/org/apache/camel/quarkus/component/soap/deployment/SoapProcessor.java
index 11846b7d5074..b35419ad389e 100644
--- a/extensions/soap/deployment/src/main/java/org/apache/camel/quarkus/component/soap/deployment/SoapProcessor.java
+++ b/extensions/soap/deployment/src/main/java/org/apache/camel/quarkus/component/soap/deployment/SoapProcessor.java
@@ -24,7 +24,6 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 
@@ -42,32 +41,6 @@ NativeImageResourceBuildItem nativeImageResources() {
         return new NativeImageResourceBuildItem("soap.xsd", "soap12.xsd", "xml.xsd");
     }
 
-    @BuildStep
-    void serviceProviders(BuildProducer<ServiceProviderBuildItem> serviceProvider) {
-        String[] soapVersions = new String[] { "1_1", "1_2" };
-        for (String version : soapVersions) {
-            serviceProvider.produce(
-                    new ServiceProviderBuildItem(
-                            "javax.xml.soap.MessageFactory",
-                            "com.sun.xml.messaging.saaj.soap.ver" + version + ".SOAPMessageFactory" + version + "Impl"));
-
-            serviceProvider.produce(
-                    new ServiceProviderBuildItem(
-                            "javax.xml.soap.SOAPFactory",
-                            "com.sun.xml.messaging.saaj.soap.ver" + version + ".SOAPFactory" + version + "Impl"));
-        }
-
-        serviceProvider.produce(
-                new ServiceProviderBuildItem(
-                        "javax.xml.soap.SOAPConnectionFactory",
-                        "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory"));
-
-        serviceProvider.produce(
-                new ServiceProviderBuildItem(
-                        "javax.xml.soap.SAAJMetaFactory",
-                        "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl"));
-    }
-
     @BuildStep
     void registerForReflection(CombinedIndexBuildItem combinedIndex, BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         IndexView index = combinedIndex.getIndex();
diff --git a/extensions/soap/runtime/pom.xml b/extensions/soap/runtime/pom.xml
index 5d091e69b21e..3da0d77fdeb7 100644
--- a/extensions/soap/runtime/pom.xml
+++ b/extensions/soap/runtime/pom.xml
@@ -61,6 +61,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-jaxb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.cxf</groupId>
+            <artifactId>quarkus-cxf-saaj</artifactId>
+        </dependency>
     </dependencies>
 
     <build>