From 346ce1ac782d0aa1f0865a25d765791c573fb1b5 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Tue, 18 Oct 2022 08:45:26 +0100
Subject: [PATCH] Updating to jdom2

---
 pom.xml                                          | 10 +++++++---
 .../jxpath/ri/JXPathContextReferenceImpl.java    |  2 +-
 .../ri/model/jdom/JDOMAttributeIterator.java     |  6 +++---
 .../ri/model/jdom/JDOMAttributePointer.java      |  2 +-
 .../ri/model/jdom/JDOMNamespaceIterator.java     |  6 +++---
 .../jxpath/ri/model/jdom/JDOMNodeIterator.java   |  4 ++--
 .../jxpath/ri/model/jdom/JDOMNodePointer.java    | 16 ++++++++--------
 .../jxpath/ri/model/jdom/JDOMPointerFactory.java |  4 ++--
 .../apache/commons/jxpath/xml/JDOMParser.java    |  2 +-
 .../jxpath/ri/model/jdom/JDOMModelTest.java      | 12 ++++++------
 .../jxpath/ri/model/jdom/TestJDOMFactory.java    |  2 +-
 11 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 077150899..4a4fa34d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,9 +176,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>1.0</version>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -221,6 +221,10 @@
           <groupId>commons-digester</groupId>
           <artifactId>commons-digester</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
diff --git a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
index e25a8d1f5..c0158eb9c 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
@@ -92,7 +92,7 @@ public class JXPathContextReferenceImpl extends JXPathContext {
         // JDOM  factory is only registered if JDOM is on the classpath
         Object jdomFactory = allocateConditionally(
                 "org.apache.commons.jxpath.ri.model.jdom.JDOMPointerFactory",
-                "org.jdom.Document");
+                "org.jdom2.Document");
         if (jdomFactory != null) {
             nodeFactories.add(jdomFactory);
         }
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
index 550a1c4e7..84c4b9386 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
@@ -23,9 +23,9 @@
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * An iterator of attributes of a DOM Node.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java
index eac5bfc68..d6c9ae1db 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java
@@ -19,7 +19,7 @@
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 import org.apache.commons.jxpath.util.TypeUtils;
-import org.jdom.Attribute;
+import org.jdom2.Attribute;
 
 /**
  * A Pointer that points to a DOM node.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java
index 62c018dc4..2990907e5 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java
@@ -23,9 +23,9 @@
 
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * An iterator of namespaces of a DOM Node.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
index 06e482e17..ba3219ba0 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
@@ -22,8 +22,8 @@
 import org.apache.commons.jxpath.ri.compiler.NodeTest;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 
 /**
  * An iterator of children of a JDOM Node.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
index f53f23e5b..deaa682c6 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
@@ -32,14 +32,14 @@
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 import org.apache.commons.jxpath.util.TypeUtils;
-import org.jdom.Attribute;
-import org.jdom.CDATA;
-import org.jdom.Comment;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.ProcessingInstruction;
-import org.jdom.Text;
+import org.jdom2.Attribute;
+import org.jdom2.CDATA;
+import org.jdom2.Comment;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.ProcessingInstruction;
+import org.jdom2.Text;
 
 /**
  * A Pointer that points to a DOM node.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
index 786378cee..c153aa52e 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
@@ -21,8 +21,8 @@
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 import org.apache.commons.jxpath.ri.model.NodePointerFactory;
-import org.jdom.Document;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.Element;
 
 /**
  * Implements NodePointerFactory for DOM elements.
diff --git a/src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java b/src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java
index fd52c67e4..f3b573678 100644
--- a/src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java
+++ b/src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java
@@ -19,7 +19,7 @@
 import java.io.InputStream;
 
 import org.apache.commons.jxpath.JXPathException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * An implementation of the XMLParser interface that produces a JDOM Document.
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
index 12631f6bd..4b5b3b6f6 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
@@ -23,11 +23,11 @@
 import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
 import org.apache.commons.jxpath.xml.DocumentContainer;
 
-import org.jdom.Attribute;
-import org.jdom.CDATA;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Text;
+import org.jdom2.Attribute;
+import org.jdom2.CDATA;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Text;
 
 /**
  * Tests JXPath with JDOM
@@ -133,4 +133,4 @@ private void appendXMLSignature(
                 pi);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/TestJDOMFactory.java b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/TestJDOMFactory.java
index 43dd4a9b3..7ac12acdd 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/TestJDOMFactory.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/TestJDOMFactory.java
@@ -21,7 +21,7 @@
 import org.apache.commons.jxpath.AbstractFactory;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.Pointer;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Test AbstractFactory.