Author: bentmann
Date: Sun Mar 15 19:28:37 2009
New Revision: 754731

URL: http://svn.apache.org/viewvc?rev=754731&view=rev
Log:
o Fixed resolution of plugin metaversions

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

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=754731&r1=754730&r2=754731&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Sun Mar 15 19:28:37 2009
@@ -182,7 +182,7 @@
         // TODO: this should be possibly outside
         // All version-resolution logic has been moved to 
DefaultPluginVersionManager.
         logger.debug( "Resolving plugin: " + plugin.getKey() + " with version: 
" + pluginVersion );
-        if ( ( pluginVersion == null ) || Artifact.LATEST_VERSION.equals( 
pluginVersion ) || Artifact.RELEASE_VERSION.equals( pluginVersion ) )
+        if ( pluginVersion == null )
         {
             logger.debug( "Resolving version for plugin: " + plugin.getKey() );
             pluginVersion = resolvePluginVersion( plugin.getGroupId(), 
plugin.getArtifactId(), project, session );
@@ -212,6 +212,8 @@
             {
                 Artifact pluginArtifact = resolvePluginArtifact( plugin, 
project, session );
 
+                plugin.setVersion( pluginArtifact.getBaseVersion() );
+
                 addPlugin( plugin, pluginArtifact, project, session );
             }
             else


Reply via email to