You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/10/30 22:29:44 UTC
svn commit: r590473 - in
/maven/plugin-tools/trunk/maven-plugin-testing-harness: pom.xml
src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Author: hboutemy
Date: Tue Oct 30 14:29:43 2007
New Revision: 590473
URL: http://svn.apache.org/viewvc?rev=590473&view=rev
Log:
added XML encoding support when reading POM file
Modified:
maven/plugin-tools/trunk/maven-plugin-testing-harness/pom.xml
maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Modified: maven/plugin-tools/trunk/maven-plugin-testing-harness/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-testing-harness/pom.xml?rev=590473&r1=590472&r2=590473&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-testing-harness/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-testing-harness/pom.xml Tue Oct 30 14:29:43 2007
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=590473&r1=590472&r2=590473&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java Tue Oct 30 14:29:43 2007
@@ -27,12 +27,12 @@
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.ReflectionUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import java.io.File;
-import java.io.FileReader;
import java.io.Reader;
import java.util.Map;
import java.util.HashMap;
@@ -114,7 +114,7 @@
{
File pluginPom = new File( getBasedir(), "pom.xml" );
- Xpp3Dom pluginPomDom = Xpp3DomBuilder.build( new FileReader( pluginPom ) );
+ Xpp3Dom pluginPomDom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( pluginPom ) );
String artifactId = pluginPomDom.getChild( "artifactId" ).getValue();
@@ -140,7 +140,7 @@
{
File pluginPom = new File( getBasedir(), "pom.xml" );
- Xpp3Dom pluginPomDom = Xpp3DomBuilder.build( new FileReader( pluginPom ) );
+ Xpp3Dom pluginPomDom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( pluginPom ) );
String artifactId = pluginPomDom.getChild( "artifactId" ).getValue();
@@ -207,7 +207,7 @@
protected PlexusConfiguration extractPluginConfiguration( String artifactId, File pom )
throws Exception
{
- Reader reader = new FileReader( pom );
+ Reader reader = ReaderFactory.newXmlReader( pom );
Xpp3Dom pomDom = Xpp3DomBuilder.build( reader );