diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java index 154485ff8c..66a38daf07 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -51,7 +51,7 @@ public void testitFirstMatchWins() Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteArtifacts( "org.apache.maven.its.mng3974" ); - verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.getCliOptions().add( "--settings" ); verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "validate" ); diff --git a/its/core-it-suite/src/test/resources/mng-3974/pom.xml b/its/core-it-suite/src/test/resources/mng-3974/pom.xml index 69f6d899e8..b8955b3c19 100644 --- a/its/core-it-suite/src/test/resources/mng-3974/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3974/pom.xml @@ -47,31 +47,6 @@ under the License. - - - - maven-core-it-a - http://maven.apache.org/null - - ignore - - - false - - - - - maven-core-it-b - http://maven.apache.org/null - - ignore - - - false - - - - diff --git a/its/core-it-suite/src/test/resources/mng-3974/settings.xml b/its/core-it-suite/src/test/resources/mng-3974/settings-template.xml similarity index 76% rename from its/core-it-suite/src/test/resources/mng-3974/settings.xml rename to its/core-it-suite/src/test/resources/mng-3974/settings-template.xml index c870cd42f8..9f1fff015f 100644 --- a/its/core-it-suite/src/test/resources/mng-3974/settings.xml +++ b/its/core-it-suite/src/test/resources/mng-3974/settings-template.xml @@ -20,6 +20,39 @@ under the License. --> + + + maven-core-it-repo + + + + maven-core-it-a + http://maven.apache.org/null + + ignore + + + false + + + + + maven-core-it-b + http://maven.apache.org/null + + ignore + + + false + + + + + + + maven-core-it-repo + +