svn commit: r289348 - in /maven/components/trunk: maven-artifact/src/main/java/org/apache/maven/artifact/ maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ maven-plugins/maven-release-plugin/src/main/java/org/apache/mav...

[jdcasey]

Author: jdcasey
Date: Thu Sep 15 16:36:29 2005
New Revision: 289348

URL: http://svn.apache.org/viewcvs?rev=289348&view=rev
Log:
Resolving: MNG-876. Versions are incremented correctly again.

Modified:
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
    
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/ProjectVersionResolver.java

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=289348&r1=289347&r2=289348&view=diff
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
 Thu Sep 15 16:36:29 2005
@@ -30,7 +30,9 @@
 
     public static boolean isSnapshot( String version )
     {
-        return version != null && ( version.toUpperCase().endsWith( "SNAPSHOT" 
) || Artifact.VERSION_FILE_PATTERN.matcher( version ).matches() );
+        return version != null
+            && ( version.toUpperCase().endsWith( "SNAPSHOT" ) || 
Artifact.VERSION_FILE_PATTERN.matcher( version )
+                .matches() );
     }
     
     public static String versionlessKey( Artifact artifact )

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=289348&r1=289347&r2=289348&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
 Thu Sep 15 16:36:29 2005
@@ -239,8 +239,7 @@
                 }
             }
 
-            //TODO reinstate.
-//            removeReleasePoms();
+            removeReleasePoms();
 
             checkInNextSnapshot();
 

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=289348&r1=289347&r2=289348&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
 Thu Sep 15 16:36:29 2005
@@ -86,7 +86,7 @@
     {
         String projectVersion = project.getOriginalModel().getVersion();
 
-        if ( projectVersion.endsWith( "SNAPSHOT" ) )
+        if ( ArtifactUtils.isSnapshot( projectVersion ) )
         {
             String projectId = ArtifactUtils.versionlessKey( 
project.getGroupId(), project.getArtifactId() );
             throw new MojoExecutionException( "The project " + projectId + " 
is a snapshot (" + projectVersion +
@@ -103,17 +103,25 @@
         // releaseVersion = 1.0.4
         // snapshotVersion = 1.0.5-SNAPSHOT
 
+        String staticVersionPart = null;
         String nextVersionString = null;
-        if ( projectVersion.indexOf( "-" ) > 0 )
+        
+        int dashIdx = projectVersion.lastIndexOf( "-" );
+        int dotIdx = projectVersion.lastIndexOf( "." );
+        
+        if ( dashIdx > 0 )
         {
-            nextVersionString = projectVersion.substring( 
projectVersion.lastIndexOf( "-" ) + 1 );
+            staticVersionPart = projectVersion.substring( 0, dashIdx + 1 );
+            nextVersionString = projectVersion.substring( dashIdx + 1 );
         }
-        else if ( projectVersion.indexOf( "." ) > 0 )
+        else if ( dotIdx > 0 )
         {
-            nextVersionString = projectVersion.substring( 
projectVersion.lastIndexOf( "." ) + 1 );
+            staticVersionPart = projectVersion.substring( 0, dotIdx + 1 );
+            nextVersionString = projectVersion.substring( dotIdx + 1 );
         }
         else
         {
+            staticVersionPart = "";
             nextVersionString = projectVersion;
         }
 
@@ -121,8 +129,7 @@
         {
             nextVersionString = Integer.toString( Integer.parseInt( 
nextVersionString ) + 1 );
 
-            projectVersion = projectVersion.substring( 0, 
projectVersion.lastIndexOf( "-" ) + 1 ) + nextVersionString +
-                SNAPSHOT_CLASSIFIER;
+            projectVersion = staticVersionPart + nextVersionString + 
SNAPSHOT_CLASSIFIER;
         }
         catch ( NumberFormatException e )
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]