svn commit: r1605914 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

[kh...@apache.org]

Author: khmarbaise
Date: Thu Jun 26 21:38:47 2014
New Revision: 1605914

URL: http://svn.apache.org/r1605914
Log:
[MINVOKER-166]
 - Followup with Maven 2.2.1 problems.

Modified:
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1605914&r1=1605913&r2=1605914&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Thu Jun 26 21:38:47 2014
@@ -64,6 +64,7 @@ import org.apache.maven.plugin.registry.
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.RuntimeInfo;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
@@ -257,6 +258,9 @@ public abstract class AbstractInvokerMoj
     @Component
     private Invoker invoker;
 
+    @Component
+    private MavenSettingsBuilder settingsBuilder;
+
     /**
      * Relative path of a selector script to run prior in order to decide if the build should be executed. This script
      * may be written with either BeanShell or Groovy. If the file extension is omitted (e.g. <code>selector</code>),
@@ -1098,15 +1102,10 @@ public abstract class AbstractInvokerMoj
             if ( interpolatedSettingsFile != null )
             {
                 // Have to merge the specified settings file (dominant) and the one of the invoking Maven process
-                Reader reader = null;
                 try
                 {
-                    reader = new XmlStreamReader( interpolatedSettingsFile );
-                    SettingsXpp3Reader settingsReader = new SettingsXpp3Reader();
-                    Settings dominantSettings = settingsReader.read( reader );
-
-                    Settings recessiveSettings = cloneSettings();
-
+                    Settings dominantSettings = settingsBuilder.buildSettings(interpolatedSettingsFile, false);
+					Settings recessiveSettings = cloneSettings();
                     SettingsUtils.merge( dominantSettings, recessiveSettings, TrackableBase.USER_LEVEL );
 
                     mergedSettings = dominantSettings;
@@ -1120,10 +1119,6 @@ public abstract class AbstractInvokerMoj
                 {
                     throw new MojoExecutionException( "Could not read specified settings file", e );
                 }
-                finally
-                {
-                    IOUtil.close( reader );
-                }
             }
         }
         if ( this.settingsFile != null && !mergeUserSettings )