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/09/23 15:20:41 UTC
svn commit: r698174 -
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Author: bentmann
Date: Tue Sep 23 06:20:41 2008
New Revision: 698174
URL: http://svn.apache.org/viewvc?rev=698174&view=rev
Log:
[MINVOKER-67] Create interpolated settings file in cloneProjectsTo directory and keep it after execution
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=698174&r1=698173&r2=698174&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java Tue Sep 23 06:20:41 2008
@@ -922,8 +922,15 @@
File interpolatedSettingsFile = null;
if ( settingsFile != null )
{
- interpolatedSettingsFile =
- new File( settingsFile.getParentFile(), "interpolated-" + settingsFile.getName() );
+ if ( cloneProjectsTo != null )
+ {
+ interpolatedSettingsFile = new File( cloneProjectsTo, "interpolated-" + settingsFile.getName() );
+ }
+ else
+ {
+ interpolatedSettingsFile =
+ new File( settingsFile.getParentFile(), "interpolated-" + settingsFile.getName() );
+ }
buildInterpolatedFile( settingsFile, interpolatedSettingsFile );
}
@@ -944,7 +951,7 @@
}
finally
{
- if ( interpolatedSettingsFile != null )
+ if ( interpolatedSettingsFile != null && cloneProjectsTo == null )
{
interpolatedSettingsFile.delete();
}