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

PR: MNG-479 

child repositories have precedence over parents with the same ID

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225465 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-07-27 06:20:40 +00:00
parent 740f7ad838
commit b42c7d3c66
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -189,13 +189,11 @@ private void assembleModelBaseInheritance( ModelBase child, ModelBase parent )
{
Repository repository = (Repository) iterator.next();
// parent will always override child repositories
// if there are duplicates
if ( childRepositories.contains( repository ) )
// child will always override parent repositories if there are duplicates
if ( !childRepositories.contains( repository ) )
{
childRepositories.remove( repository );
child.addRepository( repository );
}
child.addRepository( repository );
}
// Mojo Repositories :: aggregate

3
maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
View File

@ -263,7 +263,8 @@ public void testRepositoryInheritenceWhereParentHasRepositoryAndTheChildHasSameI
Model child = makeRepositoryModel( "child", "central", "http://repo2.maven.org/maven/" );
List repos = new ArrayList( parent.getRepositories() );
// We want to get the child repository here.
List repos = new ArrayList( child.getRepositories() );
assembler.assembleModelInheritance( child, parent );