From 2cce5d1bde57d1c4a2038558a3882177bd197b80 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 16 Jul 2010 08:18:05 +0000 Subject: [PATCH] o Polished code git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@964708 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/model/merge/MavenModelMerger.java | 7 +++++++ .../java/org/apache/maven/model/merge/ModelMerger.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java index 65660dd53c..e52d233bd8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java @@ -33,6 +33,7 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.DeploymentRepository; import org.apache.maven.model.Developer; import org.apache.maven.model.DistributionManagement; +import org.apache.maven.model.Exclusion; import org.apache.maven.model.Extension; import org.apache.maven.model.InputLocation; import org.apache.maven.model.IssueManagement; @@ -585,6 +586,12 @@ public class MavenModelMerger return object.getGroupId() + ':' + object.getArtifactId(); } + @Override + protected Object getExclusionKey( Exclusion object ) + { + return object.getGroupId() + ':' + object.getArtifactId(); + } + private String appendPath( String parentPath, Map context ) { Object artifactId = context.get( ARTIFACT_ID ); diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java index 822a1af151..4a591288b6 100644 --- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java +++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java @@ -2901,7 +2901,7 @@ public class ModelMerger protected Object getExclusionKey( Exclusion object ) { - return object.getGroupId() + ':' + object.getArtifactId(); + return object; } }