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/07/24 13:53:04 UTC
svn commit: r679372 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Author: bentmann
Date: Thu Jul 24 04:53:03 2008
New Revision: 679372
URL: http://svn.apache.org/viewvc?rev=679372&view=rev
Log:
o Added command line parsing for alternate user settings
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
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=679372&r1=679371&r2=679372&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 04:53:03 2008
@@ -3,7 +3,6 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.maven.shared.invoker.DefaultInvocationRequest;
import org.apache.maven.shared.invoker.DefaultInvoker;
@@ -67,6 +66,8 @@
private static final char CHECKSUM_WARNING_POLICY = 'c';
+ private static final char ALTERNATE_USER_SETTINGS = 's';
+
private static final String FAIL_FAST = "ff";
private static final String FAIL_AT_END = "fae";
@@ -137,6 +138,10 @@
.withDescription( "Warn if checksums don't match" )
.create( CHECKSUM_WARNING_POLICY ) );
+ OPTIONS.addOption( OptionBuilder.withLongOpt( "settings" )
+ .withDescription( "Alternate path for the user settings file" ).hasArg()
+ .create( ALTERNATE_USER_SETTINGS ) );
+
OPTIONS.addOption( OptionBuilder.withLongOpt( "fail-fast" )
.withDescription( "Stop at first failure in reactorized builds" )
.create( FAIL_FAST ) );
@@ -274,6 +279,11 @@
req.setGlobalChecksumPolicy( InvocationRequest.CHECKSUM_POLICY_WARN );
}
+ if ( cli.hasOption( ALTERNATE_USER_SETTINGS ) )
+ {
+ req.setUserSettingsFile( new File( cli.getOptionValue( ALTERNATE_USER_SETTINGS ) ) );
+ }
+
if ( cli.hasOption( FAIL_AT_END ) )
{
req.setFailureBehavior( InvocationRequest.REACTOR_FAIL_AT_END );
@@ -321,6 +331,7 @@
if ( releaseEnvironment.getSettings() != null )
{
+ // FIXME: This is effectively useless, since getFile() always returns null
req.setUserSettingsFile( releaseEnvironment.getSettings().getRuntimeInfo().getFile() );
}