[MNG-5096] <exclusion> on <dependency> with <type>test-jar</type> doe…

…sn't work in maven 3
mkristian · Jul 25, 2011 · ac5dbf9 · ac5dbf9
1 parent 1aa6b32
commit ac5dbf9
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -36,6 +36,7 @@
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.RepositorySystemSession;
 import org.sonatype.aether.RequestTrace;
+import org.sonatype.aether.artifact.ArtifactType;
 import org.sonatype.aether.artifact.ArtifactTypeRegistry;
 import org.sonatype.aether.collection.CollectRequest;
 import org.sonatype.aether.collection.DependencyCollectionException;
@@ -92,7 +93,18 @@ public DependencyResolutionResult resolve( DependencyResolutionRequest request )
             Map<String, Dependency> dependencies = new HashMap<String, Dependency>();
             for ( Dependency dependency : project.getDependencies() )
             {
-                String key = dependency.getManagementKey();
+                String classifier = dependency.getClassifier();
+                if ( classifier == null )
+                {
+                    ArtifactType type = stereotypes.get( dependency.getType() );
+                    if ( type != null )
+                    {
+                        classifier = type.getClassifier();
+                    }
+                }
+                String key =
+                    ArtifacIdUtils.toVersionlessId( dependency.getGroupId(), dependency.getArtifactId(),
+                                                    dependency.getType(), classifier );
                 dependencies.put( key, dependency );
             }
             for ( Artifact artifact : project.getDependencyArtifacts() )