You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2008/03/02 02:39:19 UTC
svn commit: r632691 -
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: carlos
Date: Sat Mar 1 17:39:18 2008
New Revision: 632691
URL: http://svn.apache.org/viewvc?rev=632691&view=rev
Log:
[MNG-3410] Managed versions in plugins are not considered when using them. Merged rev# 632683 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=632691&r1=632690&r2=632691&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sat Mar 1 17:39:18 2008
@@ -1,3 +1,4 @@
+
package org.apache.maven.plugin;
/*
@@ -702,8 +703,25 @@
repositories.addAll( resolutionGroup.getResolutionRepositories() );
repositories.addAll( project.getRemoteArtifactRepositories() );
+ /* get plugin managed versions */
+ Map pluginManagedDependencies = new HashMap();
+ try
+ {
+ MavenProject pluginProject =
+ mavenProjectBuilder.buildFromRepository( pluginArtifact, project.getRemoteArtifactRepositories(),
+ localRepository );
+ if ( pluginProject != null )
+ {
+ pluginManagedDependencies = pluginProject.getManagedVersionMap();
+ }
+ }
+ catch ( ProjectBuildingException e )
+ {
+ // this can't happen, it would have blowed up at artifactMetadataSource.retrieve()
+ }
+
ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, pluginArtifact,
- Collections.EMPTY_MAP,
+ pluginManagedDependencies,
localRepository, repositories,
artifactMetadataSource,
artifactFilter );