From 4d3e1513e0823560bab96c525976787efaae5259 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 6 Mar 2009 01:16:12 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750732 13f79535-47bb-0310-9956-ffa450edef68 --- ...3906MergedPluginClassPathOrderingTest.java | 3 + .../src/test/resources/mng-3906/sub/pom.xml | 25 --------- .../mng-3906/sub/settings-template.xml | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-3906/sub/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java index 66509c81a3..99bbc9342e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -52,6 +52,9 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3906" ); + 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(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/resources/mng-3906/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-3906/sub/pom.xml index 10eeb1fe59..43de3987eb 100644 --- a/its/core-it-suite/src/test/resources/mng-3906/sub/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3906/sub/pom.xml @@ -35,31 +35,6 @@ under the License. Test that project-level plugin dependencies are properly merged during inheritance. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - diff --git a/its/core-it-suite/src/test/resources/mng-3906/sub/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3906/sub/settings-template.xml new file mode 100644 index 0000000000..cde4215860 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3906/sub/settings-template.xml @@ -0,0 +1,55 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +