You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/08/03 05:11:06 UTC
svn commit: r227150 - in
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release:
PrepareReleaseMojo.java helpers/ReleaseProgressTracker.java
Author: jdcasey
Date: Tue Aug 2 20:11:03 2005
New Revision: 227150
URL: http://svn.apache.org/viewcvs?rev=227150&view=rev
Log:
Working on: MNG-662
o Cleaned up resume functionality, and checkpointing for the release:prepare mojo.
TODO:
- Add testing of some sort
- Verify that maven-scm's checkin function is recursive (suspect it's not)
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ReleaseProgressTracker.java
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=227150&r1=227149&r2=227150&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Tue Aug 2 20:11:03 2005
@@ -166,7 +166,7 @@
getLog().warn( "Error writing checkpoint.", e );
}
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_PREPARED_RELEASE ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_PREPARED_RELEASE ) )
{
checkForLocalModifications();
@@ -228,7 +228,7 @@
private void transformPomToSnapshotVersionPom( MavenProject project )
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_POM_TRANSORMED_FOR_DEVELOPMENT ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_POM_TRANSORMED_FOR_DEVELOPMENT ) )
{
if ( isSnapshot( project.getVersion() ) )
{
@@ -373,7 +373,7 @@
try
{
releaseProgress = ReleaseProgressTracker.load( basedir );
-
+
releaseProgress.verifyResumeCapable();
}
catch ( IOException e )
@@ -395,6 +395,8 @@
+ ". Creating new instance." );
}
+ releaseProgress.setResumeAtCheckpoint( resume );
+
releaseProgress.setUsername( username );
if ( password != null )
@@ -441,7 +443,7 @@
private void checkForLocalModifications()
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_LOCAL_MODIFICATIONS_CHECKED ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_LOCAL_MODIFICATIONS_CHECKED ) )
{
getLog().info( "Verifying there are no local modifications ..." );
@@ -512,7 +514,7 @@
private void checkForPresenceOfSnapshots( MavenProject project )
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_SNAPSHOTS_CHECKED ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_SNAPSHOTS_CHECKED ) )
{
getLog().info( "Checking lineage for snapshots ..." );
@@ -612,7 +614,7 @@
private void transformPomToReleaseVersionPom( MavenProject project )
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_POM_TRANSFORMED_FOR_RELEASE ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_POM_TRANSFORMED_FOR_RELEASE ) )
{
if ( !isSnapshot( project.getVersion() ) )
{
@@ -751,7 +753,7 @@
private void generateReleasePom( MavenProject project )
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_GENERATED_RELEASE_POM ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_GENERATED_RELEASE_POM ) )
{
MavenProject releaseProject = new MavenProject( project );
Model releaseModel = releaseProject.getModel();
@@ -947,7 +949,7 @@
private void checkInRelease()
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_CHECKED_IN_RELEASE_VERSION ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_CHECKED_IN_RELEASE_VERSION ) )
{
checkIn( "**/pom.xml,**/release-pom.xml", "[maven-release-plugin] prepare release" );
@@ -965,7 +967,7 @@
private void removeReleasePoms()
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_REMOVED_RELEASE_POM ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_REMOVED_RELEASE_POM ) )
{
File currentReleasePomFile = null;
@@ -1028,7 +1030,7 @@
private void checkInNextSnapshot()
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_CHECKED_IN_DEVELOPMENT_VERSION ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_CHECKED_IN_DEVELOPMENT_VERSION ) )
{
checkIn( "**/pom.xml", "[maven-release-plugin] prepare for next development iteration" );
@@ -1113,7 +1115,7 @@
private void tagRelease()
throws MojoExecutionException
{
- if ( !getReleaseProgress().reachedCheckpoint( ReleaseProgressTracker.CP_TAGGED_RELEASE ) )
+ if ( !getReleaseProgress().verifyCheckpoint( ReleaseProgressTracker.CP_TAGGED_RELEASE ) )
{
String tag = getTagLabel();
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ReleaseProgressTracker.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ReleaseProgressTracker.java?rev=227150&r1=227149&r2=227150&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ReleaseProgressTracker.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ReleaseProgressTracker.java Tue Aug 2 20:11:03 2005
@@ -5,11 +5,9 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.Date;
import java.util.Properties;
@@ -54,6 +52,8 @@
private Properties releaseProperties;
+ private boolean resumeAtCheckpoint = false;
+
private ReleaseProgressTracker()
{
}
@@ -230,11 +230,16 @@
releaseProperties.setProperty( CHECKPOINT_PREFIX + pointName, "OK" );
}
- public boolean reachedCheckpoint( String pointName )
+ public boolean verifyCheckpoint( String pointName )
{
checkLoaded();
- return "OK".equals( releaseProperties.getProperty( CHECKPOINT_PREFIX + pointName ) );
+ return resumeAtCheckpoint && "OK".equals( releaseProperties.getProperty( CHECKPOINT_PREFIX + pointName ) );
+ }
+
+ public void setResumeAtCheckpoint( boolean resumeAtCheckpoint )
+ {
+ this.resumeAtCheckpoint = resumeAtCheckpoint;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org