removed extra libraries for XML

Author: raydac

jcp/pom.xml

@@ -155,27 +155,6 @@
       <artifactId>commons-codec</artifactId>
       <version>1.15</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.12.2</version>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-          </exclusion>
-        </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.4.01</version>
-    </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
@@ -375,10 +354,6 @@
             </goals>
             <configuration>
               <relocations>
-                <relocation>
-                  <pattern>javax.xml</pattern>
-                  <shadedPattern>hidden.jcp.javax.xml</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>org.apache.commons</pattern>
                   <shadedPattern>hidden.jcp.org.apache.commons</shadedPattern>
@@ -387,46 +362,10 @@
                   <pattern>license</pattern>
                   <shadedPattern>hidden.jcp.license</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>org.xml</pattern>
-                  <shadedPattern>hidden.jcp.org.xml</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.xpath</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.xpath</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.xml</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.xml</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.wml</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.wml</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.regexp</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.regexp</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>org.apache.html</pattern>
                   <shadedPattern>hidden.jcp.org.apache.html</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>org.apache.bcel</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.bcel</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.xerces</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.xerces</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.xalan</pattern>
-                  <shadedPattern>hidden.jcp.org.apache.xalan</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.w3c</pattern>
-                  <shadedPattern>hidden.jcp.org.w3c</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>java_cup</pattern>
                   <shadedPattern>hidden.jcp.java_cup</shadedPattern>
@@ -447,10 +386,7 @@
                   <include>commons-codec:*</include>
                   <include>commons-text:*</include>
                   <include>org.apache.commons:*</include>
-                  <include>xerces:*</include>
-                  <include>xalan:*</include>
                   <include>com.igormaznitsa:*</include>
-                  <include>xml-apis:*</include>
                 </includes>
               </artifactSet>
               <filters>
@@ -460,10 +396,7 @@
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>
-                    <exclude>META-INF/services/javax.xml.*</exclude>
                     <exclude>META-INF/services/org.apache.*</exclude>
-                    <exclude>META-INF/services/org.w3c.*</exclude>
-                    <exclude>META-INF/services/org.xml.*</exclude>
                   </excludes>
                 </filter>
               </filters>

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/xml/AbstractXMLFunction.java

@@ -27,7 +27,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import org.apache.xpath.jaxp.XPathFactoryImpl;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -102,7 +101,7 @@ public static String getFirstLevelTextContent(final Node node) {
 
   protected static XPathExpression prepareXPathExpression(final String path)
       throws XPathExpressionException {
-    final XPathFactory factory = new XPathFactoryImpl();
+    final XPathFactory factory = XPathFactory.newInstance();
     final XPath xpath = factory.newXPath();
     return xpath.compile(path);
   }

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/xml/FunctionXML_OPEN.java

@@ -29,8 +29,8 @@
 import com.igormaznitsa.jcp.expression.ValueType;
 import java.io.File;
 import java.io.IOException;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -85,7 +85,7 @@ public Value executeStr(final PreprocessorContext context, final Value filePath)
 
 
   private Document openFileAndParse(final PreprocessorContext context, final File file) {
-    final DocumentBuilderFactoryImpl docBuilderFactory = new DocumentBuilderFactoryImpl();
+    final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
     docBuilderFactory.setIgnoringComments(true);
     docBuilderFactory.setCoalescing(true);
     docBuilderFactory.setValidating(false);

jcp/src/test/java/com/igormaznitsa/jcp/AbstractMockPreprocessorContextTest.java

@@ -28,6 +28,7 @@
 import com.igormaznitsa.jcp.exceptions.PreprocessorException;
 import com.igormaznitsa.jcp.utils.ResetablePrinter;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 

jcp/src/test/java/com/igormaznitsa/jcp/expression/functions/AbstractFunctionTest.java

@@ -32,10 +32,12 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.*;
 
+@PowerMockIgnore({"com.sun.*","com.oracle.*","javax.*","org.w3c.*", "org.xml.*", "java.*"})
 public abstract class AbstractFunctionTest extends AbstractSpyPreprocessorContextTest {
 
   protected static Map<String, Value> var(final Map<String, Value> map, final String name, final Value val) {

jcp/src/test/java/com/igormaznitsa/jcp/expression/functions/xml/AbstractFunctionXMLTest.java

@@ -32,6 +32,7 @@
 import java.io.File;
 import org.junit.Before;
 import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 public abstract class AbstractFunctionXMLTest extends AbstractFunctionTest {