You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/07/15 18:06:32 UTC
svn commit: r1752859 -
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Author: khmarbaise
Date: Fri Jul 15 18:06:32 2016
New Revision: 1752859
URL: http://svn.apache.org/viewvc?rev=1752859&view=rev
Log:
Refactored code.
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=1752859&r1=1752858&r2=1752859&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 Fri Jul 15 18:06:32 2016
@@ -1145,24 +1145,9 @@ public abstract class AbstractInvokerMoj
// interpolate settings file
// -----------------------------------------------
- File interpolatedSettingsFile = null;
- if ( settingsFile != null )
- {
- if ( cloneProjectsTo != null )
- {
- interpolatedSettingsFile = new File( cloneProjectsTo, "interpolated-" + settingsFile.getName() );
- }
- else
- {
- interpolatedSettingsFile =
- new File( settingsFile.getParentFile(), "interpolated-" + settingsFile.getName() );
- }
- buildInterpolatedFile( settingsFile, interpolatedSettingsFile );
- }
+ File interpolatedSettingsFile = interpolateSettings();
- File mergedSettingsFile = mergeSettings( interpolatedSettingsFile );
-
- final File finalSettingsFile = mergedSettingsFile;
+ final File mergedSettingsFile = mergeSettings( interpolatedSettingsFile );
if ( mavenHome != null )
{
@@ -1202,7 +1187,7 @@ public abstract class AbstractInvokerMoj
{
try
{
- runBuild( projectsDir, job, finalSettingsFile, javaHome, actualJreVersion );
+ runBuild( projectsDir, job, mergedSettingsFile, javaHome, actualJreVersion );
}
catch ( MojoExecutionException e )
{
@@ -1227,7 +1212,7 @@ public abstract class AbstractInvokerMoj
{
for ( BuildJob job : buildJobs )
{
- runBuild( projectsDir, job, finalSettingsFile, javaHome, actualJreVersion );
+ runBuild( projectsDir, job, mergedSettingsFile, javaHome, actualJreVersion );
}
}
}
@@ -1246,6 +1231,31 @@ public abstract class AbstractInvokerMoj
}
/**
+ * Interpolate settings.xml file.
+ * @return The interpolated settings.xml file.
+ * @throws MojoExecutionException in case of a problem.
+ */
+ private File interpolateSettings()
+ throws MojoExecutionException
+ {
+ File interpolatedSettingsFile = null;
+ if ( settingsFile != null )
+ {
+ if ( cloneProjectsTo != null )
+ {
+ interpolatedSettingsFile = new File( cloneProjectsTo, "interpolated-" + settingsFile.getName() );
+ }
+ else
+ {
+ interpolatedSettingsFile =
+ new File( settingsFile.getParentFile(), "interpolated-" + settingsFile.getName() );
+ }
+ buildInterpolatedFile( settingsFile, interpolatedSettingsFile );
+ }
+ return interpolatedSettingsFile;
+ }
+
+ /**
* Merge the settings file
*
* @param interpolatedSettingsFile The interpolated settings file.