Revert "[JBWS-4377]:Remove xerces dependency and use JDK's JAXP impl …

…instead" This reverts commit 543970e.
jbliznak · Nov 12, 2023 · b5b60ce · b5b60ce
1 parent 249eb28
commit b5b60ce
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/modules/addons/transports/udp/pom.xml b/modules/addons/transports/udp/pom.xml
@@ -44,6 +44,10 @@
       <groupId>com.fasterxml.woodstox</groupId>
       <artifactId>woodstox-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
     <!-- END - this should be JDK9 only dependency -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml b/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
@@ -43,6 +43,7 @@
         <module name="org.jboss.ws.api"/>
         <module name="org.jboss.ws.spi"/>
         <module name="org.jboss.logging"/>
+        <module name="org.apache.xerces" services="import"/>
         <module name="org.jboss.jaxbintros"/>
     </dependencies>
 </module>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
@@ -182,6 +182,12 @@
       <artifactId>jakarta.xml.ws-api</artifactId>
     </dependency>
 
+    <!-- jboss provided -->
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
+
     <!-- transitive dependencies -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>

diff --git a/modules/testsuite/cxf-tests/pom.xml b/modules/testsuite/cxf-tests/pom.xml
@@ -71,6 +71,11 @@
       <artifactId>woodstox-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
        <groupId>org.apache.derby</groupId>
        <artifactId>derby</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -97,6 +97,7 @@
     <saaj.api.version>1.0.0.Final</saaj.api.version>
     <saaj.impl.version>3.0.0</saaj.impl.version>
     <velocity.version>2.3</velocity.version>
+    <xerces.version>2.12.0.SP05</xerces.version>
     <xmlsec.version>3.0.2</xmlsec.version>
     <wss4j.version>3.0.1</wss4j.version>
     <wstx.version>6.4.0</wstx.version>
@@ -720,6 +721,15 @@
         <artifactId>jakarta.servlet-api</artifactId>
         <version>${jakarta.servlet-api.version}</version>
       </dependency>
+
+      <!-- jboss provided -->
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>${xerces.version}</version>
+        <scope>provided</scope>
+      </dependency>
+
       <!-- transitive dependencies -->
       <dependency>
         <groupId>jakarta.activation</groupId>