[maven-release] branch jdom2 created (now 6bde0cc)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-release] branch jdom2 created (now 6bde0cc)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch jdom2
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


      at 6bde0cc  Upgrade to JDom 2

This branch includes the following new commits:

     new 6bde0cc  Upgrade to JDom 2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Reply | Threaded
Open this post in threaded view
|

[maven-release] 01/01: Upgrade to JDom 2

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch jdom2
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 6bde0ccc821d8cc1c7f33ace4e19df2e7208429f
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Sat Jun 27 17:04:54 2020 +0200

    Upgrade to JDom 2
---
 maven-release-manager/pom.xml                      |  2 +-
 .../shared/release/transform/jdom/JDomBuild.java   |  2 +-
 .../release/transform/jdom/JDomDependency.java     |  2 +-
 .../transform/jdom/JDomDependencyManagement.java   |  2 +-
 .../release/transform/jdom/JDomExtension.java      |  2 +-
 .../transform/jdom/JDomMavenCoordinate.java        |  2 +-
 .../shared/release/transform/jdom/JDomModel.java   |  6 +++---
 .../release/transform/jdom/JDomModelBase.java      |  2 +-
 .../release/transform/jdom/JDomModelETL.java       | 22 +++++++++++-----------
 .../shared/release/transform/jdom/JDomParent.java  |  2 +-
 .../shared/release/transform/jdom/JDomPlugin.java  |  2 +-
 .../transform/jdom/JDomPluginManagement.java       |  2 +-
 .../shared/release/transform/jdom/JDomProfile.java |  2 +-
 .../release/transform/jdom/JDomProperties.java     |  2 +-
 .../release/transform/jdom/JDomReportPlugin.java   |  2 +-
 .../release/transform/jdom/JDomReporting.java      |  2 +-
 .../shared/release/transform/jdom/JDomScm.java     |  2 +-
 .../shared/release/transform/jdom/JDomUtils.java   |  6 +++---
 .../release/transform/jdom/JDomBuildTest.java      |  4 ++--
 .../jdom/JDomDependencyManagementTest.java         |  4 ++--
 .../release/transform/jdom/JDomDependencyTest.java |  4 ++--
 .../release/transform/jdom/JDomExtensionTest.java  |  4 ++--
 .../release/transform/jdom/JDomModelTest.java      |  6 +++---
 .../release/transform/jdom/JDomParentTest.java     |  4 ++--
 .../release/transform/jdom/JDomPropertiesTest.java |  4 ++--
 .../shared/release/transform/jdom/JDomScmTest.java |  4 ++--
 .../src/test/resources/pomfinder/pom1.xml          |  2 +-
 maven-release-plugin/pom.xml                       |  2 +-
 pom.xml                                            |  4 ++--
 29 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 9f1edb0..af13182 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -143,7 +143,7 @@
 
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
     </dependency>
 
     <dependency>
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
index 433c8f4..f2f2625 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
@@ -29,7 +29,7 @@ import org.apache.maven.model.Extension;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.Resource;
-import org.jdom.Element;
+import org.jdom2.Element;
 /**
  * JDom implementation of poms BUILD element
  *
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
index 96b99d1..e04661e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
 import org.apache.maven.shared.release.transform.MavenCoordinate;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms DEPENDENCY element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
index aade7c8..11f8c38 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms DEPENDENCYMANAGEMENT element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
index a5dca63..259ae1b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
@@ -21,7 +21,7 @@ package org.apache.maven.shared.release.transform.jdom;
 
 import org.apache.maven.model.Extension;
 import org.apache.maven.shared.release.transform.MavenCoordinate;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms EXTENSION element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
index 83b927a..ad4098e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
@@ -20,7 +20,7 @@ package org.apache.maven.shared.release.transform.jdom;
  */
 
 import org.apache.maven.shared.release.transform.MavenCoordinate;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  *
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
index 88271ba..2e13943 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
@@ -32,9 +32,9 @@ import org.apache.maven.model.Parent;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Reporting;
 import org.apache.maven.model.Scm;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Text;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Text;
 
 /**
  * JDom implementation of poms PROJECT element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
index cdc6442..015e929 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  *
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
index e0b8457..7966ad6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -35,17 +35,17 @@ import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.transform.ModelETL;
 import org.apache.maven.shared.release.util.ReleaseUtil;
 import org.codehaus.plexus.util.WriterFactory;
-import org.jdom.CDATA;
-import org.jdom.Comment;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.filter.ContentFilter;
-import org.jdom.filter.ElementFilter;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.CDATA;
+import org.jdom2.Comment;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.ContentFilter;
+import org.jdom2.filter.ElementFilter;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 /**
  * JDom implementation for extracting, transform, loading the Model (pom.xml)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
index be345df..758cff1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
@@ -20,7 +20,7 @@ package org.apache.maven.shared.release.transform.jdom;
  */
 
 import org.apache.maven.model.Parent;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms PARENT element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
index bf21eea..dc0da4e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
@@ -28,7 +28,7 @@ import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
 import org.apache.maven.shared.release.transform.MavenCoordinate;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms PLUGIN element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
index b997bde..7748b66 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms PLUGINMANAGEMENT element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
index 0bcc4bb..f6ed66a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.BuildBase;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Profile;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms PROFILE element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
index a0f4c75..2e43920 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
@@ -31,7 +31,7 @@ import java.util.InvalidPropertiesFormatException;
 import java.util.Properties;
 import java.util.Set;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms PROPERTIES element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
index b781ef1..b7d65a4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.ReportSet;
 import org.apache.maven.shared.release.transform.MavenCoordinate;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms reports PLUGIN element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
index 2a07f15..ad0005d 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.Reporting;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms REPORTING element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
index 9187dcc..742851e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
@@ -20,7 +20,7 @@ package org.apache.maven.shared.release.transform.jdom;
  */
 
 import org.apache.maven.model.Scm;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * JDom implementation of poms SCM element
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
index 17355f8..12d728b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
@@ -21,9 +21,9 @@ package org.apache.maven.shared.release.transform.jdom;
 
 import java.util.Iterator;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Text;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
 
 /**
  * Common JDom functions
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
index 1b59392..ce21dd1 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertNull;
 
 import java.io.StringReader;
 
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomBuildTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
index 82adbc0..4a2761e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.StringReader;
 
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomDependencyManagementTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
index 1cb36a2..af752ec 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNull;
 
 import java.io.StringReader;
 
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomDependencyTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
index c42ffdb..d82ee71 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNull;
 
 import java.io.StringReader;
 
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomExtensionTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
index e17f071..a37b7ce 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
@@ -27,9 +27,9 @@ import java.io.StringReader;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Scm;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomModelTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
index 1cc0a59..5ccdb66 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.*;
 
 import java.io.StringReader;
 
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomParentTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
index 71b847e..8a7c722 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
@@ -30,8 +30,8 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
 
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomPropertiesTest
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
index d9faa90..0124f7e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNull;
 
 import java.io.StringReader;
 
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 public class JDomScmTest
diff --git a/maven-release-manager/src/test/resources/pomfinder/pom1.xml b/maven-release-manager/src/test/resources/pomfinder/pom1.xml
index 3571257..e4c16d4 100644
--- a/maven-release-manager/src/test/resources/pomfinder/pom1.xml
+++ b/maven-release-manager/src/test/resources/pomfinder/pom1.xml
@@ -92,7 +92,7 @@
 
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 3bf479e..b1d3d28 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
     </dependency>
     
     <!-- verified with ITs -->
diff --git a/pom.xml b/pom.xml
index cdd698b..c09a300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,8 +185,8 @@
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>1.1.3</version>
+        <artifactId>jdom2</artifactId>
+        <version>2.0.6</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>