Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-1103 

Submitted by: John Tolentino
Reviewed by:  Brett Porter
increment "rcX" correctly

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312807 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-11 04:29:57 +00:00
parent 515160ef75
commit 70bec85071
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/helpers/ProjectVersionResolver.java
View File

@ -20,7 +20,7 @@ import org.apache.maven.artifact.ArtifactUtils;
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 @@ public class ProjectVersionResolver
projectVersion = inputVersion;
}
}
catch ( Exception e )
catch ( IOException e )
{
throw new MojoExecutionException( "Can't read release version from user input.", e );
}
@ -112,13 +112,19 @@ public class ProjectVersionResolver
// 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 );