svn commit: r371099 - /maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

[mp...@apache.org]

Author: mperham
Date: Sat Jan 21 10:47:20 2006
New Revision: 371099

URL: http://svn.apache.org/viewcvs?rev=371099&view=rev
Log:
PR: MRELEASE-31
Versions in the dependencyManagement section should not be auto-incremented if they are released versions.

Modified:
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=371099&r1=371098&r2=371099&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Sat Jan 21 10:47:20 2006
@@ -343,13 +343,17 @@
             {
                 Dependency dep = (Dependency) i.next();
 
-                if ( dep.getVersion() != null )
+                // If our dependency specifies an explicit released version, do NOT update
+                // it to the latest released version.  If we depend on a SNAPSHOT that is
+                // being released, we update the version to reflect the newly released version.
+                // TODO Cleaner way to determine snapshot?
+                if ( dep.getVersion() != null && dep.getVersion().endsWith( "-SNAPSHOT" ) )
                 {
                     String version = versionResolver.getResolvedVersion( dep.getGroupId(), dep.getArtifactId() );
 
                     if ( version != null )
                     {
-                        getLog().info( "Updating DM " + dep.getArtifactId() + " to " + version );
+                        getLog().info( "Updating DepMgmt " + dep.getArtifactId() + " to " + version );
                         dep.setVersion( version );
                     }
                 }