mirror of https://github.com/apache/maven.git
o Fixed precedence of plugin groups (request > settings > defaults)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777165 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
5eb52b5dee
commit
cad43e6b56
|
@ -585,6 +585,16 @@ public MavenExecutionRequest addPluginGroup( String pluginGroup )
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MavenExecutionRequest addPluginGroups( List<String> pluginGroups )
|
||||||
|
{
|
||||||
|
for ( String pluginGroup : pluginGroups )
|
||||||
|
{
|
||||||
|
addPluginGroup( pluginGroup );
|
||||||
|
}
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isUsePluginUpdateOverride()
|
public boolean isUsePluginUpdateOverride()
|
||||||
{
|
{
|
||||||
return usePluginUpdateOverride;
|
return usePluginUpdateOverride;
|
||||||
|
|
|
@ -23,11 +23,9 @@
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
|
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
|
||||||
import org.apache.maven.model.Plugin;
|
|
||||||
import org.apache.maven.model.Profile;
|
import org.apache.maven.model.Profile;
|
||||||
import org.apache.maven.project.ProjectBuilderConfiguration;
|
import org.apache.maven.project.ProjectBuilderConfiguration;
|
||||||
import org.apache.maven.settings.Settings;
|
import org.apache.maven.settings.Settings;
|
||||||
|
@ -171,6 +169,7 @@ public interface MavenExecutionRequest
|
||||||
List<String> getPluginGroups();
|
List<String> getPluginGroups();
|
||||||
MavenExecutionRequest setPluginGroups( List<String> pluginGroups );
|
MavenExecutionRequest setPluginGroups( List<String> pluginGroups );
|
||||||
MavenExecutionRequest addPluginGroup( String pluginGroup );
|
MavenExecutionRequest addPluginGroup( String pluginGroup );
|
||||||
|
MavenExecutionRequest addPluginGroups( List<String> pluginGroups );
|
||||||
|
|
||||||
boolean isUsePluginUpdateOverride();
|
boolean isUsePluginUpdateOverride();
|
||||||
MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
|
MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -58,8 +57,6 @@ public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Co
|
||||||
{
|
{
|
||||||
pom( request, configuration );
|
pom( request, configuration );
|
||||||
|
|
||||||
populateDefaultPluginGroups( request, configuration );
|
|
||||||
|
|
||||||
settings( request, configuration );
|
settings( request, configuration );
|
||||||
|
|
||||||
localRepository( request, configuration );
|
localRepository( request, configuration );
|
||||||
|
@ -105,10 +102,8 @@ else if ( request.getBaseDirectory() == null )
|
||||||
|
|
||||||
private void populateDefaultPluginGroups( MavenExecutionRequest request, Configuration configuration )
|
private void populateDefaultPluginGroups( MavenExecutionRequest request, Configuration configuration )
|
||||||
{
|
{
|
||||||
List<String> pluginGroups = new ArrayList<String>();
|
request.addPluginGroup( "org.apache.maven.plugins" );
|
||||||
pluginGroups.add( "org.apache.maven.plugins" );
|
request.addPluginGroup( "org.codehaus.mojo" );
|
||||||
pluginGroups.add( "org.codehaus.mojo" );
|
|
||||||
request.setPluginGroups( pluginGroups );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process plugin groups
|
// Process plugin groups
|
||||||
|
@ -119,7 +114,9 @@ private void processSettings( MavenExecutionRequest request, Configuration confi
|
||||||
{
|
{
|
||||||
Settings settings = request.getSettings();
|
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();
|
List<org.apache.maven.settings.Profile> settingsProfiles = settings.getProfiles();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue