From 951cb1fc85690295ef6cf542482f6ec9ddda8288 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 6 Mar 2009 00:38:42 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750712 13f79535-47bb-0310-9956-ffa450edef68 --- ...mng3805ExtensionClassPathOrderingTest.java | 3 ++ .../src/test/resources/mng-3805/pom.xml | 13 ------ .../resources/mng-3805/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-3805/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index 16b7e601ac..ff77bb9dab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -52,6 +52,9 @@ public class MavenITmng3805ExtensionClassPathOrderingTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3805" ); + 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-3805/pom.xml b/its/core-it-suite/src/test/resources/mng-3805/pom.xml index ba0226e305..22dcd1302c 100644 --- a/its/core-it-suite/src/test/resources/mng-3805/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3805/pom.xml @@ -31,19 +31,6 @@ under the License. Verify that the extension manager respects the ordering of the extension's dependencies when setting up the class realm. - - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - diff --git a/its/core-it-suite/src/test/resources/mng-3805/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3805/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3805/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +