svn commit: r964708 - in /maven/maven-3/trunk: .gitignore apache-maven/src/bin/m2.conf maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java

[bentmann]

Author: bentmann
Date: Fri Jul 16 08:18:05 2010
New Revision: 964708

URL: http://svn.apache.org/viewvc?rev=964708&view=rev
Log:
o Polished code

Modified:
    maven/maven-3/trunk/.gitignore   (props changed)
    maven/maven-3/trunk/apache-maven/src/bin/m2.conf   (props changed)
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
    
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java

Propchange: maven/maven-3/trunk/.gitignore
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-3/trunk/apache-maven/src/bin/m2.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=964708&r1=964707&r2=964708&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 Fri Jul 16 08:18:05 2010
@@ -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<Object, Object> context )
     {
         Object artifactId = context.get( ARTIFACT_ID );

Modified: 
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=964708&r1=964707&r2=964708&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
 (original)
+++ 
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
 Fri Jul 16 08:18:05 2010
@@ -2901,7 +2901,7 @@ public class ModelMerger
 
     protected Object getExclusionKey( Exclusion object )
     {
-        return object.getGroupId() + ':' + object.getArtifactId();
+        return object;
     }
 
 }