From 7ed829b780fc10396d68cb4047260baea627fbc4 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Fri, 6 Mar 2009 00:59:44 +0000
Subject: [PATCH] o Moved repository declarations to settings

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750720 13f79535-47bb-0310-9956-ffa450edef68
---
 .../MavenITmng1323AntrunDependenciesTest.java |   3 ++
 .../src/test/resources/mng-1323/a/pom.xml     |  13 ------
 .../src/test/resources/mng-1323/b/pom.xml     |  13 ------
 .../maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar | Bin
 .../maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom |   0
 .../its/mng1323/dep-a/maven-metadata.xml      |   0
 .../maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar | Bin
 .../maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom |   0
 .../its/mng1323/dep-b/maven-metadata.xml      |   0
 .../resources/mng-1323/settings-template.xml  |  43 ++++++++++++++++++
 10 files changed, 46 insertions(+), 26 deletions(-)
 rename its/core-it-suite/src/test/resources/mng-1323/{a => }/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar (100%)
 rename its/core-it-suite/src/test/resources/mng-1323/{a => }/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom (100%)
 rename its/core-it-suite/src/test/resources/mng-1323/{a => }/repo/org/apache/maven/its/mng1323/dep-a/maven-metadata.xml (100%)
 rename its/core-it-suite/src/test/resources/mng-1323/{b => }/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar (100%)
 rename its/core-it-suite/src/test/resources/mng-1323/{b => }/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom (100%)
 rename its/core-it-suite/src/test/resources/mng-1323/{b => }/repo/org/apache/maven/its/mng1323/dep-b/maven-metadata.xml (100%)
 create mode 100644 its/core-it-suite/src/test/resources/mng-1323/settings-template.xml

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
index 96c4091660..da17790ca9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -56,6 +56,9 @@ public class MavenITmng1323AntrunDependenciesTest
         verifier.deleteDirectory( "b/target" );
         verifier.deleteDirectory( "c/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1323" );
+        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-1323/a/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
index e3a7646ce4..92e4935c2a 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
@@ -32,19 +32,6 @@ under the License.
 
   <name>Maven Integration Test :: MNG-1323 :: Module A</name> 
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
index a59924c7ed..60df01911c 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
@@ -40,19 +40,6 @@ under the License.
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.jar
diff --git a/its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/0.1/dep-a-0.1.pom
diff --git a/its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/maven-metadata.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/a/repo/org/apache/maven/its/mng1323/dep-a/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-a/maven-metadata.xml
diff --git a/its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.jar
diff --git a/its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/0.1/dep-b-0.1.pom
diff --git a/its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/maven-metadata.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-1323/b/repo/org/apache/maven/its/mng1323/dep-b/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-1323/repo/org/apache/maven/its/mng1323/dep-b/maven-metadata.xml
diff --git a/its/core-it-suite/src/test/resources/mng-1323/settings-template.xml b/its/core-it-suite/src/test/resources/mng-1323/settings-template.xml
new file mode 100644
index 0000000000..c985d1a689
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-1323/settings-template.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>