You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/11 06:30:07 UTC
svn commit: r312807 -
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
Author: brett
Date: Mon Oct 10 21:29:57 2005
New Revision: 312807
URL: http://svn.apache.org/viewcvs?rev=312807&view=rev
Log:
PR: MNG-1103
Submitted by: John Tolentino
Reviewed by: Brett Porter
increment "rcX" correctly
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java?rev=312807&r1=312806&r2=312807&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java Mon Oct 10 21:29:57 2005
@@ -20,7 +20,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.components.inputhandler.InputHandler;
+import org.codehaus.plexus.components.interactivity.InputHandler;
import org.codehaus.plexus.util.StringUtils;
import java.io.IOException;
@@ -73,7 +73,7 @@
projectVersion = inputVersion;
}
}
- catch ( Exception e )
+ catch ( IOException e )
{
throw new MojoExecutionException( "Can't read release version from user input.", e );
}
@@ -112,13 +112,19 @@
// releaseVersion = 1.0.4
// snapshotVersion = 1.0.5-SNAPSHOT
- String staticVersionPart = null;
- String nextVersionString = null;
+ String staticVersionPart;
+ String nextVersionString;
+ int rcIdx = projectVersion.toLowerCase().lastIndexOf( "-rc" );
int dashIdx = projectVersion.lastIndexOf( "-" );
int dotIdx = projectVersion.lastIndexOf( "." );
- if ( dashIdx > 0 )
+ if ( rcIdx >= dashIdx )
+ {
+ staticVersionPart = projectVersion.substring( 0, rcIdx + 3 );
+ nextVersionString = projectVersion.substring( rcIdx + 3 );
+ }
+ else if ( dashIdx > 0 )
{
staticVersionPart = projectVersion.substring( 0, dashIdx + 1 );
nextVersionString = projectVersion.substring( dashIdx + 1 );