o Delayed injection of plugin default configuration until the project is actually executed to allow for plugin resolution from the reactor

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@803243 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -42,6 +42,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
 import org.apache.maven.repository.DelegatingLocalArtifactRepository;
 import org.codehaus.plexus.PlexusContainer;
@@ -216,7 +217,10 @@ private MavenExecutionResult processResult( MavenExecutionResult result, Excepti
         
         ExceptionSummary es = handler.handleException( e );                        
 
+        if ( !result.getExceptions().contains( e ) )
+        {
             result.addException( e );
+        }
         
         result.setExceptionSummary( es );    
         
@@ -288,8 +292,15 @@ private Map<String, MavenProject> getProjectMap( List<MavenProject> projects )
     private void collectProjects( List<MavenProject> projects, List<File> files, MavenExecutionRequest request )
         throws MavenExecutionException, ProjectBuildingException
     {
-        List<ProjectBuildingResult> results =
+        ProjectBuildingRequest projectBuildingRequest = request.getProjectBuildingRequest();
-            projectBuilder.build( files, request.isRecursive(), request.getProjectBuildingRequest() );
+
+        /*
+         * NOTE: We delay plugin configuration processing until a project is actually build to allow plugins to be
+         * resolved from the reactor.
+         */
+        projectBuildingRequest.setProcessPluginConfiguration( false );
+
+        List<ProjectBuildingResult> results = projectBuilder.build( files, request.isRecursive(), projectBuildingRequest );
 
         for ( ProjectBuildingResult result : results )
         {

maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

@@ -176,6 +176,9 @@ public void execute( MavenSession session )
             {
                 session.setCurrentProject( currentProject );
 
+                repositoryRequest.setRemoteRepositories( currentProject.getPluginArtifactRepositories() );
+                populateDefaultConfigurationForPlugins( currentProject.getBuild().getPlugins(), repositoryRequest );
+
                 ClassRealm projectRealm = currentProject.getClassRealm();
                 if ( projectRealm != null )
                 {

maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

@@ -499,7 +499,7 @@ private MavenProject toProject( ModelBuildingResult result, ProjectBuildingReque
 
         try
         {
-            if ( configuration.isProcessPlugins() )
+            if ( configuration.isProcessPlugins() && configuration.isProcessPluginConfiguration() )
             {
                 RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
                 repositoryRequest.setLocalRepository( configuration.getLocalRepository() );

maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java

@@ -52,6 +52,8 @@ public class DefaultProjectBuildingRequest
 
     private boolean processPlugins;
 
+    private boolean processPluginConfiguration;
+
     private List<Profile> profiles;
 
     private List<String> activeProfileIds;
@@ -67,6 +69,7 @@ public class DefaultProjectBuildingRequest
     public DefaultProjectBuildingRequest()
     {
         processPlugins = true;
+        processPluginConfiguration = true;
         profiles = new ArrayList<Profile>();
         activeProfileIds = new ArrayList<String>();
         inactiveProfileIds = new ArrayList<String>();
@@ -221,6 +224,17 @@ public ProjectBuildingRequest setProcessPlugins( boolean processPlugins )
         return this;
     }
 
+    public boolean isProcessPluginConfiguration()
+    {
+        return processPluginConfiguration;
+    }
+
+    public ProjectBuildingRequest setProcessPluginConfiguration( boolean processPluginConfiguration )
+    {
+        this.processPluginConfiguration = processPluginConfiguration;
+        return this;
+    }
+
     public ProjectBuildingRequest setValidationLevel( int validationLevel )
     {
         this.validationLevel = validationLevel;

maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java

@@ -97,6 +97,10 @@ public interface ProjectBuildingRequest
 
     boolean isProcessPlugins();
 
+    ProjectBuildingRequest setProcessPluginConfiguration( boolean processPluginConfiguration );
+
+    boolean isProcessPluginConfiguration();
+
     /**
      * Controls the level of validation to perform on processed models. By default, models are validated in strict mode.
      *