svn commit: r796657 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

[be...@apache.org]

Author: bentmann
Date: Wed Jul 22 10:03:53 2009
New Revision: 796657

URL: http://svn.apache.org/viewvc?rev=796657&view=rev
Log:
o Fixed resolution of plugin default config. The project building request provides only the base set of repos, not the final set. In addition to the base set, the final repo list contains POM repos and repos from external profiles. Therefore, the MavenProject instance (which holds the final repo set) has to be queried for the repos.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=796657&r1=796656&r2=796657&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Jul 22 10:03:53 2009
@@ -140,8 +140,6 @@
 
             project.setOriginalModel( result.getRawModel() );
 
-//            project.setRemoteArtifactRepositories( configuration.getRemoteRepositories() );
-//            project.setPluginArtifactRepositories( configuration.getPluginArtifactRepositories() );
             project.setRemoteArtifactRepositories( listener.getRemoteRepositories() );
             project.setPluginArtifactRepositories( listener.getPluginRepositories() );
 
@@ -153,7 +151,7 @@
                 {
                     lifecycle.populateDefaultConfigurationForPlugins( model.getBuild().getPlugins(),
                                                                       configuration.getLocalRepository(),
-                                                                      configuration.getPluginArtifactRepositories() );
+                                                                      project.getPluginArtifactRepositories() );
                 }
             }
             catch ( LifecycleExecutionException e )