From d17fd4ca86a33254bb2462388c419ee176b4aaa0 Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Fri, 3 Oct 2008 23:06:25 +0000 Subject: [PATCH] Fix for IT0096, IT0097. Now checking session to see if plugin is part of reactor before trying to resolve it. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701563 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/DefaultPluginManagerSupport.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java index 3a27ab24f2..01b68233e2 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java @@ -94,9 +94,23 @@ public Artifact resolvePluginArtifact( Plugin plugin, remoteRepositories.addAll( project.getRemoteArtifactRepositories() ); - MavenProject pluginProject = buildPluginProject( plugin, - localRepository, - remoteRepositories ); + MavenProject pluginProject = null; + for(MavenProject mp : (List) session.getSortedProjects()) + { + if(mp.getId().equals(project.getId())) + { + pluginProject = mp; + break; + } + } + + if(pluginProject == null) + { + pluginProject = buildPluginProject( plugin, + localRepository, + remoteRepositories ); + } + checkRequiredMavenVersion( plugin, pluginProject, localRepository, remoteRepositories ); @@ -121,7 +135,6 @@ public MavenProject buildPluginProject( Plugin plugin, Artifact artifact = artifactFactory.createProjectArtifact( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion() ); - try { return mavenProjectBuilder.buildFromRepository( artifact,