[refactor] Remove the last small dependency on Apache Xalan, instead …

…use the equivalent classes from Apache Xerces
eXist-db · Dec 8, 2022 · f466b9e · f466b9e
1 parent d250847
commit f466b9e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/exist-core/pom.xml b/exist-core/pom.xml
@@ -335,12 +335,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.7.2</version> <!-- needed an compile time for various dependencies -->
-        </dependency>
-
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>

diff --git a/exist-core/src/main/java/org/exist/dom/memtree/NodeImpl.java b/exist-core/src/main/java/org/exist/dom/memtree/NodeImpl.java
@@ -21,8 +21,8 @@
  */
 package org.exist.dom.memtree;
 
-import org.apache.xml.utils.XML11Char;
-import org.apache.xml.utils.XMLChar;
+import org.apache.xerces.util.XML11Char;
+import org.apache.xerces.util.XMLChar;
 import org.exist.collections.Collection;
 import org.exist.dom.INode;
 import org.exist.dom.NodeListImpl;

diff --git a/exist-core/src/test/java/org/exist/xslt/TransformerFactoryAllocatorTest.java b/exist-core/src/test/java/org/exist/xslt/TransformerFactoryAllocatorTest.java
@@ -48,8 +48,7 @@ public class TransformerFactoryAllocatorTest {
     @Parameters(name = "{0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {
-            { "net.sf.saxon.TransformerFactoryImpl" },
-            { "org.apache.xalan.processor.TransformerFactoryImpl" }
+            { "net.sf.saxon.TransformerFactoryImpl" }
         });
     }
 

diff --git a/exist-core/src/test/resources/org/exist/config/conf1.xml b/exist-core/src/test/resources/org/exist/config/conf1.xml
@@ -71,8 +71,10 @@
 
     <serializer add-exist-id="none" compress-output="no" enable-xinclude="yes" enable-xsl="no" indent="yes" match-tagging-attributes="no" match-tagging-elements="no"/>
 
-
-    <transformer class="org.apache.xalan.processor.TransformerFactoryImpl"/>
+
+    <transformer class="net.sf.saxon.TransformerFactoryImpl" caching="yes">
+        <attribute name="http://saxon.sf.net/feature/version-warning" value="false" type="boolean"/>
+    </transformer>
 
 
     <validation mode="auto">

diff --git a/exist-core/src/test/resources/org/exist/config/conf2.xml b/exist-core/src/test/resources/org/exist/config/conf2.xml
@@ -73,8 +73,10 @@
 
     <serializer add-exist-id="none" compress-output="no" enable-xinclude="yes" enable-xsl="no" indent="yes" match-tagging-attributes="no" match-tagging-elements="no"/>
 
-
-    <transformer class="org.apache.xalan.processor.TransformerFactoryImpl"/>
+
+    <transformer class="net.sf.saxon.TransformerFactoryImpl" caching="yes">
+        <attribute name="http://saxon.sf.net/feature/version-warning" value="false" type="boolean"/>
+    </transformer>
 
 
     <validation mode="auto">