diff --git a/pom.xml b/pom.xml
index a915d9430..1235c5c66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,8 +222,8 @@
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>1.1.3</version>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -266,6 +266,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 46f2ea65a..2ecf82a11 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
@@ -91,7 +91,7 @@ public class JXPathContextReferenceImpl extends JXPathContext {
         // JDOM  factory is only registered if JDOM is on the classpath
         final 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 644a3f339..1500deb34 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 01da80277..6a7c397af 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 d254a531d..50872551a 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 89c142e8e..90fca2fd5 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 ebe4b8770..f5e3985ca 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 a8e541031..0049dee1c 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 8fcfb446d..8c56f5633 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 d708cb922..3313c423f 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
@@ -22,11 +22,12 @@
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.ri.model.AbstractXMLModelTest;
 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;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -141,4 +142,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 9e10edb18..8c5446f59 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.