Author: olamy
Date: Tue May 8 17:18:52 2012
New Revision: 1335650
URL: http://svn.apache.org/viewvc?rev=1335650&view=rev
Log:
[MINVOKER-97] fix use of a provided settings when user doesn t want to merge
with his own settings
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=1335650&r1=1335649&r2=1335650&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
Tue May 8 17:18:52 2012
@@ -563,6 +563,7 @@ public abstract class AbstractInvokerMoj
/**
* If enable and if you have a settings file configured for the execution,
it will be merged with your user settings.
+ *
* @parameter expression="${invoker.mergeUserSettings}"
default-value="false"
* @since 1.6
*/
@@ -1070,34 +1071,39 @@ public abstract class AbstractInvokerMoj
}
}
}
-
- try
+ if ( this.settingsFile != null && !mergeUserSettings )
+ {
+ mergedSettingsFile = interpolatedSettingsFile;
+ }
+ else
{
- mergedSettingsFile = File.createTempFile( "invoker-settings",
".xml" );
-
- FileWriter fileWriter = null;
try
{
- fileWriter = new FileWriter( mergedSettingsFile );
- settingsWriter.write( fileWriter, mergedSettings );
- }
- finally
- {
- IOUtil.close( fileWriter );
- }
+ mergedSettingsFile = File.createTempFile( "invoker-settings",
".xml" );
- if ( getLog().isDebugEnabled() )
+ FileWriter fileWriter = null;
+ try
+ {
+ fileWriter = new FileWriter( mergedSettingsFile );
+ settingsWriter.write( fileWriter, mergedSettings );
+ }
+ finally
+ {
+ IOUtil.close( fileWriter );
+ }
+
+ if ( getLog().isDebugEnabled() )
+ {
+ getLog().debug(
+ "Created temporary file for invoker settings.xml: " +
mergedSettingsFile.getAbsolutePath() );
+ }
+
+ }
+ catch ( IOException e )
{
- getLog().debug(
- "Created temporary file for invoker settings.xml: " +
mergedSettingsFile.getAbsolutePath() );
+ throw new MojoExecutionException( "Could not create temporary
file for invoker settings.xml", e );
}
-
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Could not create temporary file
for invoker settings.xml", e );
- }
-
final File finalSettingsFile = mergedSettingsFile;
try
