From 75ac363378c72c9d8ef011ecdb112ae4d613946c Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Thu, 15 Sep 2005 20:40:43 +0000
Subject: [PATCH] Resolving: MNG-879. Now, all isSnapshot() stuff for the
 release plugin is handled by ArtifactUtils, so it's possible to reuse the
 logic rather than replicate it.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289311 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/maven/artifact/ArtifactUtils.java  |  5 +++++
 .../plugins/release/PrepareReleaseMojo.java   | 20 +++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index f735bc50ed..e975f64d1c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -28,6 +28,11 @@ private ArtifactUtils()
     {
     }
 
+    public static boolean isSnapshot( String version )
+    {
+        return version != null && Artifact.VERSION_FILE_PATTERN.matcher( version ).matches();
+    }
+    
     public static String versionlessKey( Artifact artifact )
     {
         return versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
diff --git a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
index 31036aa29d..0f5b6c2b87 100644
--- a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
+++ b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
@@ -71,8 +71,6 @@
 public class PrepareReleaseMojo
     extends AbstractReleaseMojo
 {
-    private static final String SNAPSHOT = "-SNAPSHOT";
-
     private static final String RELEASE_POM = "release-pom.xml";
 
     private static final String POM = "pom.xml";
@@ -241,6 +239,7 @@ protected void executeTask()
                 }
             }
 
+            //TODO reinstate.
 //            removeReleasePoms();
 
             checkInNextSnapshot();
@@ -458,11 +457,6 @@ protected ProjectScmRewriter getScmRewriter()
         return scmRewriter;
     }
 
-    private boolean isSnapshot( String version )
-    {
-        return version.endsWith( SNAPSHOT );
-    }
-
     private void checkForLocalModifications()
         throws MojoExecutionException
     {
@@ -544,7 +538,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
 
             String parentVersion = null;
 
-            if ( isSnapshot( parentProject.getVersion() ) )
+            if ( ArtifactUtils.isSnapshot( parentProject.getVersion() ) )
             {
                 parentVersion = getVersionResolver().getResolvedVersion( parentProject.getGroupId(),
                                                                          parentProject.getArtifactId() );
@@ -554,7 +548,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
                     parentVersion = parentProject.getVersion();
                 }
 
-                if ( isSnapshot( parentVersion ) )
+                if ( ArtifactUtils.isSnapshot( parentVersion ) )
                 {
                     throw new MojoExecutionException( "Can't release project due to non released parent (" +
                         parentProject.getGroupId() + ":" + parentProject.getArtifactId() + parentVersion + "." );
@@ -580,7 +574,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
                 artifactVersion = artifact.getVersion();
             }
 
-            if ( isSnapshot( artifactVersion ) )
+            if ( ArtifactUtils.isSnapshot( artifactVersion ) )
             {
                 snapshotDependencies.add( artifact );
             }
@@ -600,7 +594,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
                 artifactVersion = artifact.getVersion();
             }
 
-            if ( isSnapshot( artifactVersion ) )
+            if ( ArtifactUtils.isSnapshot( artifactVersion ) )
             {
                 snapshotDependencies.add( artifact );
             }
@@ -633,7 +627,7 @@ private void checkForPresenceOfSnapshots( MavenProject project )
     private void transformPomToReleaseVersionPom( MavenProject project )
         throws MojoExecutionException
     {
-        if ( !isSnapshot( project.getVersion() ) )
+        if ( !ArtifactUtils.isSnapshot( project.getVersion() ) )
         {
             throw new MojoExecutionException( "The project " + project.getGroupId() + ":" + project.getArtifactId() +
                 " isn't a snapshot (" + project.getVersion() + ")." );
@@ -646,7 +640,7 @@ private void transformPomToReleaseVersionPom( MavenProject project )
         {
             Artifact parentArtifact = project.getParentArtifact();
 
-            if ( isSnapshot( parentArtifact.getBaseVersion() ) )
+            if ( ArtifactUtils.isSnapshot( parentArtifact.getBaseVersion() ) )
             {
                 String version = resolveVersion( parentArtifact, "parent", project );