Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-08 11:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for IT0096, IT0097. Now checking session to see if plugin is part of reactor before trying to resolve it.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701563 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-10-03 23:06:25 +00:00
parent c577d07305
commit d17fd4ca86
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
View File

@ -94,9 +94,23 @@ public Artifact resolvePluginArtifact( Plugin plugin,
remoteRepositories.addAll( project.getRemoteArtifactRepositories() ); remoteRepositories.addAll( project.getRemoteArtifactRepositories() );
MavenProject pluginProject = buildPluginProject( plugin, MavenProject pluginProject = null;
for(MavenProject mp : (List<MavenProject>) session.getSortedProjects())
{
if(mp.getId().equals(project.getId()))
{
pluginProject = mp;
break;
}
}
if(pluginProject == null)
{
pluginProject = buildPluginProject( plugin,
localRepository, localRepository,
remoteRepositories ); remoteRepositories );
}
checkRequiredMavenVersion( plugin, pluginProject, localRepository, remoteRepositories ); checkRequiredMavenVersion( plugin, pluginProject, localRepository, remoteRepositories );
@ -121,7 +135,6 @@ public MavenProject buildPluginProject( Plugin plugin,
Artifact artifact = artifactFactory.createProjectArtifact( plugin.getGroupId(), Artifact artifact = artifactFactory.createProjectArtifact( plugin.getGroupId(),
plugin.getArtifactId(), plugin.getArtifactId(),
plugin.getVersion() ); plugin.getVersion() );
try try
{ {
return mavenProjectBuilder.buildFromRepository( artifact, return mavenProjectBuilder.buildFromRepository( artifact,