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

o Polished code 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@964708 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-07-16 08:18:05 +00:00
parent d16b880a23
commit 2cce5d1bde
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -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 );

2
maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
View File

@ -2901,7 +2901,7 @@ public class ModelMerger
protected Object getExclusionKey( Exclusion object )
{
return object.getGroupId() + ':' + object.getArtifactId();
return object;
}
}