diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index ac23eb7860..9b1d067b61 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -39,10 +39,13 @@ public class MavenITmng2861RelocationsAndRangesTest { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2861" ); - Verifier verifier = new Verifier( new File( testDir, "MNG-2861" ).getAbsolutePath() ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "A/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2861" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/A/pom.xml similarity index 82% rename from its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml rename to its/core-it-suite/src/test/resources/mng-2861/A/pom.xml index 34102b2028..2cd56112af 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/A/pom.xml @@ -27,19 +27,6 @@ - - - id - file:///${basedir}/../../repo - - ignore - - - false - - - - diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/B/pom.xml similarity index 80% rename from its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml rename to its/core-it-suite/src/test/resources/mng-2861/B/pom.xml index 71d1a3eb03..8b0c52a186 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/B/pom.xml @@ -22,19 +22,6 @@ - - - id - file://localhost/${basedir}/../../repo - - ignore - - - false - - - - diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/C/pom.xml similarity index 80% rename from its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml rename to its/core-it-suite/src/test/resources/mng-2861/C/pom.xml index 9d01d0b887..f133a1c095 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/C/pom.xml @@ -22,19 +22,6 @@ - - - id - file:///${basedir}/../../repo - - ignore - - - false - - - - diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml rename to its/core-it-suite/src/test/resources/mng-2861/pom.xml diff --git a/its/core-it-suite/src/test/resources/mng-2861/settings-template.xml b/its/core-it-suite/src/test/resources/mng-2861/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2861/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +