You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/04/01 22:00:51 UTC
[maven-shade-plugin] branch MSHADE-280 created (now f487898)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHADE-280
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
at f487898 [MSHADE-280] - Upgrade jdom 1.1.3 to jdom2 2.0.6
This branch includes the following new commits:
new f487898 [MSHADE-280] - Upgrade jdom 1.1.3 to jdom2 2.0.6
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.
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-shade-plugin] 01/01: [MSHADE-280] - Upgrade jdom 1.1.3 to
jdom2 2.0.6
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHADE-280
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit f487898382847b093196eee4be486b34ba92b039
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 1 23:58:52 2018 +0200
[MSHADE-280] - Upgrade jdom 1.1.3 to jdom2 2.0.6
---
pom.xml | 4 +--
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 34 +++++++++++-----------
.../apache/maven/plugins/shade/pom/PomWriter.java | 12 ++++----
.../shade/resource/XmlAppendingTransformer.java | 32 ++++++++++----------
4 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index ccf236c..f90dc14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,8 +133,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.maven.shared</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
index e138769..7420ea5 100644
--- a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
@@ -19,6 +19,16 @@ package org.apache.maven.plugins.shade.pom;
* under the License.
*/
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.ActivationProperty;
@@ -62,23 +72,13 @@ import org.apache.maven.model.Resource;
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.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.jdom2.Content;
+import org.jdom2.DefaultJDOMFactory;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Text;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
/**
* Class MavenJDOMWriter.
diff --git a/src/main/java/org/apache/maven/plugins/shade/pom/PomWriter.java b/src/main/java/org/apache/maven/plugins/shade/pom/PomWriter.java
index 83161af..90dbaf5 100644
--- a/src/main/java/org/apache/maven/plugins/shade/pom/PomWriter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/pom/PomWriter.java
@@ -19,15 +19,15 @@ package org.apache.maven.plugins.shade.pom;
* under the License.
*/
-import org.apache.maven.model.Model;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-
import java.io.IOException;
import java.io.Writer;
+import org.apache.maven.model.Model;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+
/**
* @author Jason van Zyl
*/
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
index 6b2a3a7..5e909a7 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
@@ -19,19 +19,6 @@ package org.apache.maven.plugins.shade.resource;
* under the License.
*/
-import org.apache.maven.plugins.shade.relocation.Relocator;
-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.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -40,6 +27,19 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+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.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
/**
* Appends multiple occurrences of some XML file.
*/
@@ -98,8 +98,7 @@ public class XmlAppendingTransformer
{
Element root = r.getRootElement();
- for ( @SuppressWarnings( "unchecked" )
- Iterator<Attribute> itr = root.getAttributes().iterator(); itr.hasNext(); )
+ for ( Iterator<Attribute> itr = root.getAttributes().iterator(); itr.hasNext(); )
{
Attribute a = itr.next();
itr.remove();
@@ -112,8 +111,7 @@ public class XmlAppendingTransformer
}
}
- for ( @SuppressWarnings( "unchecked" )
- Iterator<Content> itr = root.getChildren().iterator(); itr.hasNext(); )
+ for ( Iterator<Element> itr = root.getChildren().iterator(); itr.hasNext(); )
{
Content n = itr.next();
itr.remove();
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.