You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/10/09 22:10:04 UTC
svn commit: r1396281 - in
/maven/plugin-testing/trunk/maven-plugin-testing-harness: pom.xml
src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Author: krosenvold
Date: Tue Oct 9 20:10:04 2012
New Revision: 1396281
URL: http://svn.apache.org/viewvc?rev=1396281&view=rev
Log:
o Updated to commons-io XmlReader
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml?rev=1396281&r1=1396280&r2=1396281&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml Tue Oct 9 20:10:04 2012
@@ -67,6 +67,11 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>2.2</version>
Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=1396281&r1=1396280&r2=1396281&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java Tue Oct 9 20:10:04 2012
@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -68,7 +69,6 @@ import org.codehaus.plexus.util.Interpol
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.ReflectionUtils;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -108,7 +108,7 @@ public abstract class AbstractMojoTestCa
InputStream is = getClass().getResourceAsStream( "/" + getPluginDescriptorLocation() );
- XmlStreamReader reader = ReaderFactory.newXmlReader( is );
+ XmlStreamReader reader = new XmlStreamReader( is );
InterpolationFilterReader interpolationFilterReader =
new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() );