You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/10/04 01:06:26 UTC
svn commit: r701563 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
Author: sisbell
Date: Fri Oct 3 16:06:25 2008
New Revision: 701563
URL: http://svn.apache.org/viewvc?rev=701563&view=rev
Log:
Fix for IT0096, IT0097. Now checking session to see if plugin is part of reactor before trying to resolve it.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java?rev=701563&r1=701562&r2=701563&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java Fri Oct 3 16:06:25 2008
@@ -94,9 +94,23 @@
remoteRepositories.addAll( project.getRemoteArtifactRepositories() );
- MavenProject pluginProject = buildPluginProject( plugin,
- localRepository,
- remoteRepositories );
+ 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,
+ remoteRepositories );
+ }
+
checkRequiredMavenVersion( plugin, pluginProject, localRepository, remoteRepositories );
@@ -121,7 +135,6 @@
Artifact artifact = artifactFactory.createProjectArtifact( plugin.getGroupId(),
plugin.getArtifactId(),
plugin.getVersion() );
-
try
{
return mavenProjectBuilder.buildFromRepository( artifact,