upgraded jaxen, moved to jdom2

simpligility · Feb 11, 2016 · e04422d · e04422d
1 parent d1a3597
commit e04422d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -271,12 +271,6 @@
         <version>2.3</version>
       </dependency>
 
-      <dependency>
-        <groupId>jaxen</groupId>
-        <artifactId>jaxen</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-
       <!-- test deps -->
       <dependency>
         <groupId>junit</groupId>
@@ -507,35 +501,16 @@
       </exclusions>
     </dependency>
 
+    <!-- Needed by XpathAppendingTransformer and ExtractDuplicatesIT -->
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
-      <exclusions>
-        <!--<exclusion>-->
-          <!--<groupId>jdom</groupId>-->
-          <!--<artifactId>jdom</artifactId>-->
-        <!--</exclusion>-->
-        <exclusion>
-          <groupId>dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xmlParserAPIs</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>1.1.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6</version>
     </dependency>
 
     <!-- test deps -->

diff --git a/src/main/java/com/simpligility/maven/plugins/android/resource/XpathAppendingTransformer.java b/src/main/java/com/simpligility/maven/plugins/android/resource/XpathAppendingTransformer.java
@@ -2,15 +2,15 @@
 
 import org.apache.maven.plugins.shade.relocation.Relocator;
 import org.apache.maven.plugins.shade.resource.ResourceTransformer;
-import org.jdom.Attribute;
-import org.jdom.Content;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-import org.jdom.xpath.XPath;
+import org.jdom2.Attribute;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+import org.jdom2.xpath.XPath;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -130,7 +130,7 @@ private void appendElement( Element source, Element target )
             }
         }
 
-        for ( Iterator<Content> itr = source.getChildren().iterator(); itr.hasNext(); )
+        for ( Iterator<Element> itr = source.getChildren().iterator(); itr.hasNext(); )
         {
             Content n = itr.next();
             itr.remove();