diff --git a/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index 392338dd41..fd58fc509f 100644 --- a/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -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 diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java index 3e82565e2f..fab28e9328 100644 --- a/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java @@ -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 );