You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/21 18:01:48 UTC

svn commit: r639714 - /maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java

Author: bentmann
Date: Fri Mar 21 10:01:37 2008
New Revision: 639714

URL: http://svn.apache.org/viewvc?rev=639714&view=rev
Log:
o Decoupled unit tests from default encoding of executing JVM for build reproducibility

Modified:
    maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java

Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java?rev=639714&r1=639713&r2=639714&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java Fri Mar 21 10:01:37 2008
@@ -20,7 +20,8 @@
  */
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
@@ -59,7 +60,9 @@
 
         try
         {
-            model = pomReader.read( new FileReader( new File( antTestDir, "pom.xml" ) ) );
+            File pomFile = new File( antTestDir, "pom.xml" );
+            // TODO: Once plexus-utils has been bumped to 1.4.4, use ReaderFactory.newXmlReader()
+            model = pomReader.read( new InputStreamReader( new FileInputStream( pomFile ), "UTF-8" ) );
             setModel( model );
         }
         catch ( Exception e )