svn commit: r1213779 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java

[stephenc]

Author: stephenc
Date: Tue Dec 13 16:53:10 2011
New Revision: 1213779

URL: http://svn.apache.org/viewvc?rev=1213779&view=rev
Log:
delegating to the wrong method and failing to pass through the supplied release 
environment

Modified:
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java?rev=1213779&r1=1213778&r2=1213779&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 Tue Dec 13 16:53:10 2011
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.
 
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
 import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
@@ -106,12 +107,14 @@ public class ForkedMavenExecutor
 
             if ( settingsFile != null )
             {
-                cl.createArg().setLine( "-s " + settingsFile.getAbsolutePath() 
);
+                cl.createArg().setValue( "-s");
+                cl.createArg().setFile( settingsFile );
             }
 
             if ( pomFileName != null )
             {
-                cl.createArg().setLine( "-f " + pomFileName );
+                cl.createArg().setValue( "-f" );
+                cl.createArg().setValue( pomFileName );
             }
 
             if ( goals != null )
@@ -178,7 +181,7 @@ public class ForkedMavenExecutor
                               boolean interactive, String arguments, 
ReleaseResult result )
         throws MavenExecutorException
     {
-        executeGoals( workingDirectory, goals, interactive, arguments, null, 
result );
+        executeGoals( workingDirectory, goals, releaseEnvironment, 
interactive, arguments, null, result );
     }
 
     public void setCommandLineFactory( CommandLineFactory commandLineFactory )