svn commit: r312828 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

[jd...@apache.org]

Author: jdcasey
Date: Tue Oct 11 00:40:12 2005
New Revision: 312828

URL: http://svn.apache.org/viewcvs?rev=312828&view=rev
Log:
Re-enabling RELEASE resolution as a last-ditch, for backward compat...since I just re-enabled plugin LATEST metadata production.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=312828&r1=312827&r2=312828&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java Tue Oct 11 00:40:12 2005
@@ -168,26 +168,25 @@
             }
         }
 
-        // TODO: Remove this...it shouldn't be needed anymore.
-        
+        // TODO: Remove this...it shouldn't be needed anymore. Leaving it in for backward compat.
         // final pass...retrieve the version for RELEASE and also set that resolved version as the <useVersion/>
         // in settings.xml.
-//        if ( StringUtils.isEmpty( version ) )
-//        {
-//            // 1. resolve the version to be used
-//            version = resolveMetaVersion( groupId, artifactId, project.getPluginArtifactRepositories(), localRepository,
-//                                          Artifact.RELEASE_VERSION );
-//
-//            if ( version != null )
-//            {
-//                // 2. Set the updatedVersion so the user will be prompted whether to make this version permanent.
-//                updatedVersion = version;
-//
-//                // 3. Persist this version without prompting.
-//                forcePersist = true;
-//                promptToPersist = false;
-//            }
-//        }
+        if ( StringUtils.isEmpty( version ) )
+        {
+            // 1. resolve the version to be used
+            version = resolveMetaVersion( groupId, artifactId, project, localRepository,
+                                          Artifact.RELEASE_VERSION );
+
+            if ( version != null )
+            {
+                // 2. Set the updatedVersion so the user will be prompted whether to make this version permanent.
+                updatedVersion = version;
+
+                // 3. Persist this version without prompting.
+                forcePersist = true;
+                promptToPersist = false;
+            }
+        }
 
         // if we still haven't found a version, then fail early before we get into the update goop.
         if ( StringUtils.isEmpty( version ) )