From 8558ac5f0f3db0813592f1c307e802b8314399c2 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 5 Mar 2009 23:29:21 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750679 13f79535-47bb-0310-9956-ffa450edef68 --- ...avenITmng1908LegacySnapshotUpdateTest.java | 3 ++ .../src/test/resources/mng-1908/pom.xml | 11 ----- .../resources/mng-1908/settings-template.xml | 44 +++++++++++++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-1908/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java index a355662f29..c045ae6f8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java @@ -49,6 +49,9 @@ public class MavenITmng1908LegacySnapshotUpdateTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteArtifacts( "org.apache.maven.its.mng1908" ); + 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-1908/pom.xml b/its/core-it-suite/src/test/resources/mng-1908/pom.xml index 5711782bba..4314f0fc7d 100644 --- a/its/core-it-suite/src/test/resources/mng-1908/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-1908/pom.xml @@ -39,17 +39,6 @@ under the License. - - - it0092 - file://localhost/${basedir}/repo - legacy - - ignore - - - - diff --git a/its/core-it-suite/src/test/resources/mng-1908/settings-template.xml b/its/core-it-suite/src/test/resources/mng-1908/settings-template.xml new file mode 100644 index 0000000000..f7b5e8e429 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1908/settings-template.xml @@ -0,0 +1,44 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + legacy + + ignore + + + ignore + + + + + + + maven-core-it-repo + +