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/03/05 22:58:45 UTC
svn commit: r1297243 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
Author: rfscholte
Date: Mon Mar 5 21:58:44 2012
New Revision: 1297243
URL: http://svn.apache.org/viewvc?rev=1297243&view=rev
Log:
prevent infinitive loop
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1297243&r1=1297242&r2=1297243&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Mon Mar 5 21:58:44 2012
@@ -59,6 +59,7 @@ public class CheckoutProjectFromScm
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
+ /** {@inheritDoc} */
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
@@ -139,7 +140,7 @@ public class CheckoutProjectFromScm
}
- public ReleaseResult performCheckout( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ private ReleaseResult performCheckout( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException, ScmException
{
@@ -260,10 +261,16 @@ public class CheckoutProjectFromScm
return result;
}
+ /** {@inheritDoc} */
public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return simulate( releaseDescriptor, releaseEnvironment, reactorProjects );
+ ReleaseResult result = new ReleaseResult();
+
+ logInfo( result, "The project would be checked out to perform the release ..." );
+
+ result.setResultCode( ReleaseResult.SUCCESS );
+ return result;
}
}