stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added XML encoding support when reading POM file 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@590473 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2007-10-30 21:29:43 +00:00
parent c0f7a59cfa
commit f1ead6c9e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-plugin-testing-harness/pom.xml
View File

@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>1.4.2</version> <version>1.4.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

8
maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
View File

@ -27,12 +27,12 @@ import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.ReflectionUtils; import org.codehaus.plexus.util.ReflectionUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.Reader; import java.io.Reader;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
@ -114,7 +114,7 @@ public abstract class AbstractMojoTestCase
{ {
File pluginPom = new File( getBasedir(), "pom.xml" ); 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(); String artifactId = pluginPomDom.getChild( "artifactId" ).getValue();
@ -140,7 +140,7 @@ public abstract class AbstractMojoTestCase
{ {
File pluginPom = new File( getBasedir(), "pom.xml" ); 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(); String artifactId = pluginPomDom.getChild( "artifactId" ).getValue();
@ -207,7 +207,7 @@ public abstract class AbstractMojoTestCase
protected PlexusConfiguration extractPluginConfiguration( String artifactId, File pom ) protected PlexusConfiguration extractPluginConfiguration( String artifactId, File pom )
throws Exception throws Exception
{ {
Reader reader = new FileReader( pom ); Reader reader = ReaderFactory.newXmlReader( pom );
Xpp3Dom pomDom = Xpp3DomBuilder.build( reader ); Xpp3Dom pomDom = Xpp3DomBuilder.build( reader );