Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4553] Plugins artifact filtering should use full Artifact identification instead only ArtifactId 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@917014 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-02-27 18:55:06 +00:00
parent 8a87da6a98
commit 57ff75ee45
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
View File

@ -52,33 +52,32 @@ public class DefaultArtifactFilterManager
{ {
Set<String> artifacts = new HashSet<String>(); Set<String> artifacts = new HashSet<String>();
artifacts.add( "classworlds" ); artifacts.add( "classworlds:classworlds" );
artifacts.add( "plexus-classworlds" ); artifacts.add( "org.codehaus.plexus:plexus-classworlds" );
artifacts.add( "maven-artifact" ); artifacts.add( "org.codehaus.plexus:plexus-component-api" );
artifacts.add( "maven-artifact-manager" ); artifacts.add( "org.codehaus.plexus:plexus-container-default" );
artifacts.add( "maven-artifact-resolver" ); artifacts.add( "org.apache.maven:maven-artifact" );
artifacts.add( "maven-build-context" ); artifacts.add( "org.apache.maven:maven-artifact-manager" );
artifacts.add( "maven-compat" ); artifacts.add( "org.apache.maven:maven-artifact-resolver" );
artifacts.add( "maven-core" ); artifacts.add( "org.apache.maven:maven-build-context" );
artifacts.add( "maven-error-diagnoser" ); artifacts.add( "org.apache.maven:maven-compat" );
artifacts.add( "maven-error-diagnostics" ); artifacts.add( "org.apache.maven:maven-core" );
artifacts.add( "maven-lifecycle" ); artifacts.add( "org.apache.maven:maven-error-diagnoser" );
artifacts.add( "maven-model" ); artifacts.add( "org.apache.maven:maven-error-diagnostics" );
artifacts.add( "maven-model-builder" ); artifacts.add( "org.apache.maven:maven-lifecycle" );
artifacts.add( "maven-monitor" ); artifacts.add( "org.apache.maven:maven-model" );
artifacts.add( "maven-plugin-api" ); artifacts.add( "org.apache.maven:maven-model-builder" );
artifacts.add( "maven-plugin-descriptor" ); artifacts.add( "org.apache.maven:maven-monitor" );
artifacts.add( "maven-plugin-parameter-documenter" ); artifacts.add( "org.apache.maven:maven-plugin-api" );
artifacts.add( "maven-plugin-registry" ); artifacts.add( "org.apache.maven:maven-plugin-descriptor" );
artifacts.add( "maven-profile" ); artifacts.add( "org.apache.maven:maven-plugin-parameter-documenter" );
artifacts.add( "maven-project" ); artifacts.add( "org.apache.maven:maven-plugin-registry" );
artifacts.add( "maven-repository-metadata" ); artifacts.add( "org.apache.maven:maven-profile" );
artifacts.add( "maven-settings" ); artifacts.add( "org.apache.maven:maven-project" );
artifacts.add( "maven-toolchain" ); artifacts.add( "org.apache.maven:maven-repository-metadata" );
artifacts.add( "plexus-component-api" ); artifacts.add( "org.apache.maven:maven-settings" );
artifacts.add( "plexus-container-default" ); artifacts.add( "org.apache.maven:maven-toolchain" );
artifacts.add( "wagon-provider-api" ); artifacts.add( "org.apache.maven.wagon:wagon-provider-api" );
artifacts.add( "wagon-manager" );
/* /*
* NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise * NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise

16
maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
View File

@ -46,7 +46,21 @@ public class ExclusionSetFilter
public boolean include( Artifact artifact ) public boolean include( Artifact artifact )
{ {
return !excludes.contains( artifact.getArtifactId() ); String id = artifact.getArtifactId();
if ( excludes.contains( id ) )
{
return false;
}
id = artifact.getGroupId() + ':' + id;
if ( excludes.contains( id ) )
{
return false;
}
return true;
} }
@Override @Override