Index: maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java =================================================================== --- maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (revision 584223) +++ maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (working copy) @@ -26,14 +26,15 @@ import org.apache.maven.settings.validation.SettingsValidator; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource; import org.codehaus.plexus.util.interpolation.PropertiesBasedValueSource; import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileReader; import java.io.IOException; +import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.util.List; @@ -49,7 +50,7 @@ private SettingsValidator validator; /** @since 2.1 */ - public Settings buildSettings( MavenExecutionRequest request ) + public Settings buildSettings( MavenExecutionRequest request ) throws IOException, XmlPullParserException { File userSettingsFile = request.getUserSettingsFile(); @@ -148,11 +149,11 @@ Settings settings = null; - FileReader reader = null; + Reader reader = null; try { - reader = new FileReader( settingsFile ); + reader = ReaderFactory.newXmlReader( settingsFile ); SettingsXpp3Reader modelReader = new SettingsXpp3Reader(); Index: maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java =================================================================== --- maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (revision 584223) +++ maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (working copy) @@ -22,13 +22,14 @@ import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource; import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileReader; import java.io.IOException; +import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; @@ -48,22 +49,22 @@ if ( profilesXml.exists() ) { ProfilesXpp3Reader reader = new ProfilesXpp3Reader(); - FileReader fileReader = null; + Reader profileReader = null; try { - fileReader = new FileReader( profilesXml ); - + profileReader = ReaderFactory.newXmlReader( profilesXml ); + StringWriter sWriter = new StringWriter(); - - IOUtil.copy( fileReader, sWriter ); - + + IOUtil.copy( profileReader, sWriter ); + String rawInput = sWriter.toString(); - + try { RegexBasedInterpolator interpolator = new RegexBasedInterpolator(); interpolator.addValueSource( new EnvarBasedValueSource() ); - + rawInput = interpolator.interpolate( rawInput, "settings" ); } catch ( Exception e ) @@ -78,7 +79,7 @@ } finally { - IOUtil.close( fileReader ); + IOUtil.close( profileReader ); } } Index: maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java =================================================================== --- maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (revision 584223) +++ maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (working copy) @@ -22,8 +22,8 @@ import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.project.AbstractMavenProjectTestCase; +import org.codehaus.plexus.util.ReaderFactory; -import java.io.FileReader; import java.io.Reader; import java.util.List; @@ -219,7 +219,7 @@ private ModelValidationResult validate( String testName ) throws Exception { - Reader input = new FileReader( getFileForClasspathResource( "validation/" + testName ) ); + Reader input = ReaderFactory.newXmlReader( getFileForClasspathResource( "validation/" + testName ) ); MavenXpp3Reader reader = new MavenXpp3Reader(); Index: maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (revision 584223) +++ maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (working copy) @@ -76,16 +76,14 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; -import java.io.StringWriter; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -134,8 +132,7 @@ */ /** - * @version $Id: DefaultMavenProjectBuilder.java,v 1.37 2005/03/08 01:55:22 - * trygvis Exp $ + * @version $Id$ */ public class DefaultMavenProjectBuilder extends AbstractLogEnabled @@ -1025,7 +1022,7 @@ Reader reader = null; try { - reader = new FileReader( file ); + reader = ReaderFactory.newXmlReader( file ); return readModel( projectId, file.getAbsolutePath(), reader, strict ); } catch ( FileNotFoundException e ) @@ -1050,15 +1047,11 @@ boolean strict ) throws IOException, InvalidProjectModelException { - StringWriter sw = new StringWriter(); + String modelSource = IOUtil.toString( reader ); - IOUtil.copy( reader, sw ); - - String modelSource = sw.toString(); - - if ( modelSource.indexOf( "4.0.0" ) < 0 ) + if ( modelSource.indexOf( "" + MAVEN_MODEL_VERSION ) < 0 ) { - throw new InvalidProjectModelException( projectId, pomLocation, "Not a v4.0.0 POM." ); + throw new InvalidProjectModelException( projectId, pomLocation, "Not a v" + MAVEN_MODEL_VERSION + " POM." ); } StringReader sReader = new StringReader( modelSource ); @@ -1079,10 +1072,10 @@ boolean strict ) throws ProjectBuildingException { - InputStreamReader reader = null; + Reader reader = null; try { - reader = new InputStreamReader( url.openStream() ); + reader = ReaderFactory.newXmlReader( url.openStream() ); return readModel( projectId, url.toExternalForm(), reader, strict ); } catch ( IOException e ) Index: maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java =================================================================== --- maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java (revision 584223) +++ maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java (working copy) @@ -39,12 +39,13 @@ import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileReader; import java.io.IOException; +import java.io.Reader; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; @@ -188,11 +189,11 @@ } Model model; - FileReader reader = null; + Reader reader = null; try { - reader = new FileReader( pomFile ); + reader = ReaderFactory.newXmlReader( pomFile ); model = new MavenXpp3Reader().read( reader ); } catch ( IOException e ) Index: maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java =================================================================== --- maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (revision 584223) +++ maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (working copy) @@ -36,12 +36,13 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.Reader; import java.io.Writer; import java.util.Arrays; import java.util.Iterator; @@ -461,10 +462,10 @@ MavenEmbedder.writeSettings( settingsFile, s ); - FileReader reader = null; + Reader reader = null; try { - reader = new FileReader( settingsFile ); + reader = ReaderFactory.newXmlReader( settingsFile ); Settings result = new SettingsXpp3Reader().read( reader ); assertEquals( localRepoPath, result.getLocalRepository() ); Index: maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java =================================================================== --- maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (revision 584223) +++ maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (working copy) @@ -77,15 +77,16 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.logging.LoggerManager; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.jdom.Document; import org.jdom.Element; import org.jdom.output.Format; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; import java.net.URL; @@ -208,7 +209,7 @@ public Model readModel( File file ) throws XmlPullParserException, IOException { - Reader reader = new FileReader( file ); + Reader reader = ReaderFactory.newXmlReader( file ); try { @@ -249,8 +250,6 @@ Settings settings ) throws IOException { - Writer fileWriter = new FileWriter( file ); - SettingsValidator settingsValidator = new DefaultSettingsValidator(); SettingsValidationResult validationResult = settingsValidator.validate( settings ); @@ -268,6 +267,8 @@ String encoding = settings.getModelEncoding() != null ? settings.getModelEncoding() : "UTF-8"; + Writer fileWriter = new OutputStreamWriter( new FileOutputStream( file ), encoding ); + Format format = Format.getPrettyFormat().setEncoding( encoding ); try @@ -283,7 +284,7 @@ public static Settings readSettings( File file ) throws IOException, SettingsConfigurationException { - Reader fileReader = new FileReader( file ); + Reader fileReader = ReaderFactory.newXmlReader( file ); SettingsValidator settingsValidator = new DefaultSettingsValidator(); @@ -736,7 +737,7 @@ { try { - fileReader = new FileReader( configuration.getUserSettingsFile() ); + fileReader = ReaderFactory.newXmlReader( configuration.getUserSettingsFile() ); result.setUserSettings( new SettingsXpp3Reader().read( fileReader ) ); } @@ -760,7 +761,7 @@ { try { - fileReader = new FileReader( configuration.getGlobalSettingsFile() ); + fileReader = ReaderFactory.newXmlReader( configuration.getGlobalSettingsFile() ); result.setGlobalSettings( new SettingsXpp3Reader().read( fileReader ) ); }