Upgrade jdom from 1.1.3 to 2.0.6

apache · Dec 14, 2021 · d5a378b · d5a378b
1 parent e8cbaca
commit d5a378b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 32 deletions.
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
@@ -74,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
@@ -43,8 +43,8 @@
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -221,18 +221,16 @@ public void writePom( final Model model, final File pomFile, final File initialP
         String fileEncoding =
             StringUtils.isEmpty( model.getModelEncoding() ) ? "UTF-8" : model.getModelEncoding();
 
-        org.jdom.Document doc;
+        org.jdom2.Document doc;
         try ( InputStream inputStream = new FileInputStream( initialPomFile ) )
         {
             SAXBuilder builder = new SAXBuilder();
             doc = builder.build( inputStream );
         }
         catch ( JDOMException exc )
         {
-            IOException ioe = new IOException( "Cannot parse the POM by JDOM while reading " + initialPomFile + ": "
-                                               + exc.getMessage() );
-            ioe.initCause( exc );
-            throw ioe;
+            throw new IOException( "Cannot parse the POM by JDOM while reading " + initialPomFile + ": "
+                                               + exc.getMessage(), exc );
         }
 
 

diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
@@ -73,11 +73,11 @@
 import org.apache.maven.model.Scm;
 import org.apache.maven.model.Site;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.jdom.Content;
-import org.jdom.DefaultJDOMFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Text;
+import org.jdom2.Content;
+import org.jdom2.DefaultJDOMFactory;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Text;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;

diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java
@@ -52,7 +52,7 @@
  * on the JDOM Project, please see <http://www.jdom.org/>.
  */
 
-import org.jdom.output.EscapeStrategy;
+import org.jdom2.output.EscapeStrategy;
 
 import java.lang.reflect.Method;
 
@@ -616,7 +616,7 @@ public static class TextMode
          * Mode for text normalization (left and right trim plus internal
          * whitespace is normalized to a single space.
          *
-         * @see org.jdom.Element#getTextNormalize
+         * @see org.jdom2.Element#getTextNormalize
          */
         public static final TextMode NORMALIZE = new TextMode( "NORMALIZE" );
 

diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
@@ -52,7 +52,7 @@
  * on the JDOM Project, please see <http://www.jdom.org/>.
  */
 
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
 
 import java.util.Stack;
 

diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
@@ -53,17 +53,17 @@
  */
 
 import org.codehaus.plexus.util.StringUtils;
-import org.jdom.Attribute;
-import org.jdom.CDATA;
-import org.jdom.Comment;
-import org.jdom.DocType;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.EntityRef;
-import org.jdom.Namespace;
-import org.jdom.ProcessingInstruction;
-import org.jdom.Text;
-import org.jdom.output.EscapeStrategy;
+import org.jdom2.Attribute;
+import org.jdom2.CDATA;
+import org.jdom2.Comment;
+import org.jdom2.DocType;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.EntityRef;
+import org.jdom2.Namespace;
+import org.jdom2.ProcessingInstruction;
+import org.jdom2.Text;
+import org.jdom2.output.EscapeStrategy;
 
 import javax.xml.transform.Result;
 import java.io.BufferedOutputStream;

diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java b/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestXMLOutputter.java
@@ -20,9 +20,9 @@
  */
 
 import junit.framework.TestCase;
-import org.jdom.Document;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 import java.io.IOException;
 import java.io.StringReader;

diff --git a/pom.xml b/pom.xml
@@ -193,8 +193,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>org.apache.velocity</groupId>