Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resolving <plugin><dependencies>: it0081 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497533 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2007-01-18 18:49:58 +00:00
parent 18b83fe00a
commit 2faffb229f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -310,24 +310,23 @@ public class DefaultPluginManager
// Now here we need the artifact coreArtifactFilter stuff
componentRealm = container.createComponentRealm( plugin.getKey(), jars );
componentRealm = container.createComponentRealm( projectPlugin.getKey(), jars );
}
catch ( PlexusContainerException e )
{
throw new PluginManagerException( "Failed to create realm for plugin '" + plugin + ".", e );
throw new PluginManagerException( "Failed to create realm for plugin '" + projectPlugin + ".", e );
}
// ----------------------------------------------------------------------------
// The PluginCollector will now know about the plugin we are trying to load
// ----------------------------------------------------------------------------
PluginDescriptor pluginDescriptor = pluginCollector.getPluginDescriptor( plugin );
PluginDescriptor pluginDescriptor = pluginCollector.getPluginDescriptor( projectPlugin );
if ( pluginDescriptor == null )
{
throw new IllegalStateException(
"The PluginDescriptor for the plugin " + plugin.getKey() + " was not found" );
"The PluginDescriptor for the plugin " + projectPlugin.getKey() + " was not found" );
}
pluginDescriptor.setPluginArtifact( pluginArtifact );
@ -348,14 +347,14 @@ public class DefaultPluginManager
Plugin plugin,
MavenProject project,
MavenSession session )
throws InvalidPluginException, ArtifactNotFoundException, PluginManagerException, ArtifactResolutionException
throws InvalidPluginException, ArtifactNotFoundException, ArtifactResolutionException
{
Set artifacts;
Set projectPluginDependencies;
try
{
artifacts = MavenMetadataSource.createArtifacts( artifactFactory, plugin.getDependencies(), null,
projectPluginDependencies = MavenMetadataSource.createArtifacts( artifactFactory, plugin.getDependencies(), null,
coreArtifactFilter, project );
}
catch ( InvalidDependencyVersionException e )
@ -393,6 +392,14 @@ public class DefaultPluginManager
Set resolved = result.getArtifacts();
// Also resolve the plugin dependencies specified in <plugin><dependencies>:
resolved.addAll( artifactResolver.resolveTransitively( projectPluginDependencies,
pluginArtifact,
localRepository,
repositories,
artifactMetadataSource,
artifactFilter ).getArtifacts() );
for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();