Author: krosenvold
Date: Tue Oct 9 20:00:37 2012
New Revision: 1396262
URL: http://svn.apache.org/viewvc?rev=1396262&view=rev
Log:
o Switched to commons-io XmlReader
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
maven/archetype/trunk/maven-archetype-plugin/pom.xml
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1396262&r1=1396261&r2=1396262&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Tue Oct 9 20:00:37 2012
@@ -90,6 +90,10 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=1396262&r1=1396261&r2=1396262&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
Tue Oct 9 20:00:37 2012
@@ -19,6 +19,7 @@ package org.apache.maven.archetype.old;
* under the License.
*/
+import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor;
import org.apache.maven.archetype.old.descriptor.ArchetypeDescriptorBuilder;
@@ -43,7 +44,6 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
-import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.velocity.VelocityComponent;
import org.dom4j.Document;
Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=1396262&r1=1396261&r2=1396262&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Tue Oct 9 20:00:37
2012
@@ -72,6 +72,10 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
Modified: maven/archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1396262&r1=1396261&r2=1396262&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Tue Oct 9 20:00:37 2012
@@ -215,6 +215,11 @@ under the License.
<version>1.5.8</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<version>1.0-alpha-5</version>
