You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/05/21 18:17:15 UTC
svn commit: r777165 - in /maven/components/branches/MNG-2766:
maven-core/src/main/java/org/apache/maven/execution/
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
Author: bentmann
Date: Thu May 21 16:17:15 2009
New Revision: 777165
URL: http://svn.apache.org/viewvc?rev=777165&view=rev
Log:
o Fixed precedence of plugin groups (request > settings > defaults)
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=777165&r1=777164&r2=777165&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Thu May 21 16:17:15 2009
@@ -585,6 +585,16 @@
return this;
}
+ public MavenExecutionRequest addPluginGroups( List<String> pluginGroups )
+ {
+ for ( String pluginGroup : pluginGroups )
+ {
+ addPluginGroup( pluginGroup );
+ }
+
+ return this;
+ }
+
public boolean isUsePluginUpdateOverride()
{
return usePluginUpdateOverride;
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=777165&r1=777164&r2=777165&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Thu May 21 16:17:15 2009
@@ -23,11 +23,9 @@
import java.util.Date;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.model.Plugin;
import org.apache.maven.model.Profile;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.settings.Settings;
@@ -171,6 +169,7 @@
List<String> getPluginGroups();
MavenExecutionRequest setPluginGroups( List<String> pluginGroups );
MavenExecutionRequest addPluginGroup( String pluginGroup );
+ MavenExecutionRequest addPluginGroups( List<String> pluginGroups );
boolean isUsePluginUpdateOverride();
MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=777165&r1=777164&r2=777165&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Thu May 21 16:17:15 2009
@@ -16,7 +16,6 @@
*/
import java.io.File;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -57,8 +56,6 @@
throws MavenEmbedderException
{
pom( request, configuration );
-
- populateDefaultPluginGroups( request, configuration );
settings( request, configuration );
@@ -105,10 +102,8 @@
private void populateDefaultPluginGroups( MavenExecutionRequest request, Configuration configuration )
{
- List<String> pluginGroups = new ArrayList<String>();
- pluginGroups.add( "org.apache.maven.plugins" );
- pluginGroups.add( "org.codehaus.mojo" );
- request.setPluginGroups( pluginGroups );
+ request.addPluginGroup( "org.apache.maven.plugins" );
+ request.addPluginGroup( "org.codehaus.mojo" );
}
// Process plugin groups
@@ -119,7 +114,9 @@
{
Settings settings = request.getSettings();
- request.getPluginGroups().addAll( settings.getPluginGroups() );
+ request.addPluginGroups( settings.getPluginGroups() );
+
+ populateDefaultPluginGroups( request, configuration );
List<org.apache.maven.settings.Profile> settingsProfiles = settings.getProfiles();