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

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750840 13f79535-47bb-0310-9956-ffa450edef68
---
 .../MavenITmng3814BogusProjectCycleTest.java  |   5 +-
 .../test/resources/mng-3814/plugin-a/pom.xml  |  25 --------
 .../maven/its/mng3814/maven-metadata.xml      |   9 ---
 .../test/resources/mng-3814/plugin-b/pom.xml  |  25 --------
 .../maven/its/mng3814/maven-metadata.xml      |   9 ---
 .../maven/its/mng3814/maven-metadata.xml      |  15 +++++
 .../1.0/maven-mng3814a-plugin-1.0.jar         | Bin
 .../1.0/maven-mng3814a-plugin-1.0.pom         |   0
 .../maven-mng3814a-plugin/maven-metadata.xml  |   0
 .../1.0/maven-mng3814b-plugin-1.0.jar         | Bin
 .../1.0/maven-mng3814b-plugin-1.0.pom         |   0
 .../maven-mng3814b-plugin/maven-metadata.xml  |   0
 .../resources/mng-3814/settings-template.xml  |  55 ++++++++++++++++++
 13 files changed, 74 insertions(+), 69 deletions(-)
 delete mode 100644 its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-metadata.xml
 delete mode 100644 its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-metadata.xml
 create mode 100644 its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-b => }/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.jar (100%)
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-b => }/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.pom (100%)
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-b => }/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/maven-metadata.xml (100%)
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-a => }/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.jar (100%)
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-a => }/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.pom (100%)
 rename its/core-it-suite/src/test/resources/mng-3814/{plugin-a => }/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/maven-metadata.xml (100%)
 create mode 100644 its/core-it-suite/src/test/resources/mng-3814/settings-template.xml

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index d70c87b7fc..c71ed6c501 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
@@ -42,7 +42,7 @@ public class MavenITmng3814BogusProjectCycleTest
     /**
      * Verify that the reactor's project sorter considers artifact versions when checking for cycles.
      */
-    public void testitMNG3813()
+    public void testitMNG3814()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3814" );
@@ -50,6 +50,9 @@ public class MavenITmng3814BogusProjectCycleTest
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3814" );
+        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-3814/plugin-a/pom.xml b/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml
index ca60ca305d..da8d2a31a5 100644
--- a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml
@@ -33,31 +33,6 @@ under the License.
   <version>2.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-metadata.xml
deleted file mode 100644
index 2165933774..0000000000
--- a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814b-plugin:maven-plugin:1.0</name>
-      <prefix>mng3814b</prefix>
-      <artifactId>maven-mng3814b-plugin</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml b/its/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml
index c4d62d8e0b..110d10cb5a 100644
--- a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml
@@ -33,31 +33,6 @@ under the License.
   <version>2.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-metadata.xml
deleted file mode 100644
index 4474ee0eaf..0000000000
--- a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814a-plugin:maven-plugin:1.0</name>
-      <prefix>mng3814a</prefix>
-      <artifactId>maven-mng3814a-plugin</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml
new file mode 100644
index 0000000000..a009f158d0
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <plugins>
+    <plugin>
+      <name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814a-plugin:maven-plugin:1.0</name>
+      <prefix>mng3814a</prefix>
+      <artifactId>maven-mng3814a-plugin</artifactId>
+    </plugin>
+    <plugin>
+      <name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814b-plugin:maven-plugin:1.0</name>
+      <prefix>mng3814b</prefix>
+      <artifactId>maven-mng3814b-plugin</artifactId>
+    </plugin>
+  </plugins>
+</metadata>
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.jar b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.jar
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.jar
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.pom b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.pom
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/1.0/maven-mng3814a-plugin-1.0.pom
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/maven-metadata.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/maven-metadata.xml
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.jar b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.jar
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.jar
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.pom b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.pom
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/1.0/maven-mng3814b-plugin-1.0.pom
diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/maven-metadata.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814b-plugin/maven-metadata.xml
diff --git a/its/core-it-suite/src/test/resources/mng-3814/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3814/settings-template.xml
new file mode 100644
index 0000000000..cde4215860
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-3814/settings-template.xml
@@ -0,0 +1,55 @@
+<?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>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>