You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/10/01 23:20:53 UTC
svn commit: r1392618 - in /maven/shared/trunk/maven-invoker/src:
main/java/org/apache/maven/shared/invoker/
test/java/org/apache/maven/shared/invoker/
Author: rfscholte
Date: Mon Oct 1 21:20:53 2012
New Revision: 1392618
URL: http://svn.apache.org/viewvc?rev=1392618&view=rev
Log:
[MSHARED-249] Add option for --resume-from
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?rev=1392618&r1=1392617&r2=1392618&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java Mon Oct 1 21:20:53 2012
@@ -98,6 +98,8 @@ public class DefaultInvocationRequest
private boolean alsoMakeDependents;
+ private String resumeFrom;
+
private boolean showVersion;
private String threads;
@@ -505,4 +507,21 @@ public class DefaultInvocationRequest
return this;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String getResumeFrom()
+ {
+ return resumeFrom;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InvocationRequest setResumeFrom( String resumeFrom )
+ {
+ this.resumeFrom = resumeFrom;
+ return this;
+ }
+
}
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?rev=1392618&r1=1392617&r2=1392618&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java Mon Oct 1 21:20:53 2012
@@ -110,6 +110,14 @@ public interface InvocationRequest
boolean isAlsoMakeDependents();
/**
+ * Get the value of {@code resume-from}
+ *
+ * @return specified reactor project to resume from
+ * @since 2.0.12
+ */
+ String getResumeFrom();
+
+ /**
* Gets the debug mode of the Maven invocation. By default, Maven is executed in normal mode.
*
* @return <code>true</code> if Maven should be executed in debug mode, <code>false</code> if the normal mode
@@ -627,4 +635,15 @@ public interface InvocationRequest
* @since 2.0.12
*/
InvocationRequest setAlsoMakeDependents( boolean alsoMakeDependents );
+
+ /**
+ * Resume reactor from specified project.
+ * Equivalent of {@code -rf} or {@code --resume-from}
+ *
+ * @param resumeFrom set the project to resume from
+ * @return This invocation request
+ * @since 2.0.12
+ */
+ InvocationRequest setResumeFrom( String resumeFrom );
+
}
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=1392618&r1=1392617&r2=1392618&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Mon Oct 1 21:20:53 2012
@@ -443,6 +443,12 @@ public class MavenCommandLineBuilder
}
}
+ if( StringUtils.isNotEmpty( request.getResumeFrom() ) )
+ {
+ cli.createArg().setValue( "-rf" );
+ cli.createArg().setValue( request.getResumeFrom() );
+ }
+
List<String> projectList = request.getProjects();
if ( projectList != null )
{
Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=1392618&r1=1392617&r2=1392618&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java (original)
+++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java Mon Oct 1 21:20:53 2012
@@ -525,6 +525,18 @@ public class MavenCommandLineBuilderTest
assertArgumentsPresentInOrder( cli, "-pl", "proj1", "-am", "-amd" );
}
+ public void testShouldSetResumeFrom()
+ {
+ logTestStart();
+
+ TestCommandLineBuilder tcb = new TestCommandLineBuilder();
+ Commandline cli = new Commandline();
+
+ tcb.setReactorBehavior( newRequest().setResumeFrom( ":module3" ), cli );
+
+ assertArgumentsPresentInOrder( cli, "-rf", ":module3" );
+ }
+
public void testShouldSetStrictChecksumPolityFlagFromRequest()
{
logTestStart();