Author: bentmann
Date: Thu Jul 24 01:47:47 2008
New Revision: 679307
URL:
http://svn.apache.org/viewvc?rev=679307&view=revLog:
o Fixed parsing of quoted arguments
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
maven/release/trunk/maven-release-plugin/pom.xml
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=679307&r1=679306&r2=679307&view=diff==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Thu Jul 24 01:47:47 2008
@@ -17,6 +17,7 @@
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
import java.io.File;
import java.util.ArrayList;
@@ -154,17 +155,9 @@
String additionalArguments )
throws MavenExecutorException
{
- String[] args;
- if ( additionalArguments == null )
- {
- args = new String[0];
- }
- else
- {
- args = additionalArguments.split( " " );
- }
try
{
+ String[] args = CommandLineUtils.translateCommandline( additionalArguments );
CommandLine cli = new PosixParser().parse( OPTIONS, args );
if ( cli.hasOption( SET_SYSTEM_PROPERTY ) )
@@ -294,7 +287,7 @@
req.setFailureBehavior( InvocationRequest.REACTOR_FAIL_NEVER );
}
}
- catch ( ParseException e )
+ catch ( Exception e )
{
throw new MavenExecutorException( "Failed to re-parse additional arguments for Maven invocation.", e );
}
Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=679307&r1=679306&r2=679307&view=diff==============================================================================
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Thu Jul 24 01:47:47 2008
@@ -169,6 +169,7 @@
<postBuildHookScript>verify.bsh</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
+ <debug>true</debug>
<properties>
<dryRun>true</dryRun>
</properties>