You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/09 17:50:46 UTC

svn commit: r733081 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3974/ resources/mng-3974/repo-1/ resources/mng-3974/repo-1/org/ resources/mng-3974/repo-1/org/apache/ resources/mng-3974/repo...

Author: bentmann
Date: Fri Jan  9 08:50:45 2009
New Revision: 733081

URL: http://svn.apache.org/viewvc?rev=733081&view=rev
Log:
[MNG-3974] New mirror syntax is not stopping on first match

o Added IT

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.jar   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.jar   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml   (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=733081&r1=733080&r2=733081&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Fri Jan  9 08:50:45 2009
@@ -90,6 +90,7 @@
         // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
+        suite.addTestSuite( MavenITmng3974MirrorOrderingTest.class );
         suite.addTestSuite( MavenITmng3970DepResolutionFromProfileReposTest.class );
         suite.addTestSuite( MavenITmng3955EffectiveSettingsTest.class );
         suite.addTestSuite( MavenITmng3953AuthenticatedDeploymentTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java Fri Jan  9 08:50:45 2009
@@ -0,0 +1,65 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3974">MNG-3974</a>.
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3974MirrorOrderingTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng3974MirrorOrderingTest()
+    {
+        super( "(2.0.9,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),(3.0-alpha-1,)" );
+    }
+
+    /**
+     * Test that mirror definitions are properly evaluated. In particular, the first matching mirror definition
+     * from the settings should win, i.e. ordering of mirror definitions matters.
+     */
+    public void testitFirstMatchWins()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3974" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng3974" );
+        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( "settings.xml" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        verifier.assertArtifactPresent( "org.apache.maven.its.mng3974", "a", "0.1", "jar" );
+        verifier.assertArtifactPresent( "org.apache.maven.its.mng3974", "b", "0.1", "jar" );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml Fri Jan  9 08:50:45 2009
@@ -0,0 +1,93 @@
+<?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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3974</groupId>
+  <artifactId>test-1</artifactId>
+  <version>0.1</version>
+
+  <name>Maven Integration Test :: MNG-3974</name> 
+  <description>
+    Test that mirror definitions are properly evaluated. In particular, the first matching mirror definition
+    from the settings should win, i.e. ordering of mirror definitions matters.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <!-- Provided by repo maven-core-it-a and only this repo -->
+      <groupId>org.apache.maven.its.mng3974</groupId>
+      <artifactId>a</artifactId>
+      <version>0.1</version>
+    </dependency>
+    <dependency>
+      <!-- Provided by repo maven-core-it-b and only this repo -->
+      <groupId>org.apache.maven.its.mng3974</groupId>
+      <artifactId>b</artifactId>
+      <version>0.1</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <!-- This one will be matched by exact id -->
+      <id>maven-core-it-a</id>
+      <url>http://maven.apache.org/null</url>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <!-- This one will be matched by pattern -->
+      <id>maven-core-it-b</id>
+      <url>http://maven.apache.org/null</url>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.jar?rev=733081&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.pom?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/0.1/a-0.1.pom Fri Jan  9 08:50:45 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3974</groupId>
+  <artifactId>a</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml Fri Jan  9 08:50:45 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.mng3974</groupId>
+  <artifactId>a</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20090109150820</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-1/org/apache/maven/its/mng3974/a/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.jar?rev=733081&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.pom?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/0.1/b-0.1.pom Fri Jan  9 08:50:45 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3974</groupId>
+  <artifactId>b</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml Fri Jan  9 08:50:45 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.mng3974</groupId>
+  <artifactId>b</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20090109150838</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/repo-2/org/apache/maven/its/mng3974/b/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml?rev=733081&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml Fri Jan  9 08:50:45 2009
@@ -0,0 +1,98 @@
+<?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>
+  <mirrors>
+    <!-- 
+    NOTE: The next block of mirrors matches the first test repo by exact id.
+    -->
+
+    <!-- The first match should win, so we have all later matching mirrors point to nowhere -->
+    <mirror>
+      <id>mirror-a1</id>
+      <url>@baseurl@/repo-1</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+    <!-- NOTE: Use multiple mirrors to reduce likelihood of random test success -->
+    <mirror>
+      <id>mirror-a2</id>
+      <url>@baseurl@/null0</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-a3</id>
+      <url>@baseurl@/null1</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-a4</id>
+      <url>@baseurl@/null2</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-a5</id>
+      <url>@baseurl@/null3</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-a6</id>
+      <url>@baseurl@/null4</url>
+      <mirrorOf>maven-core-it-a</mirrorOf>
+    </mirror>
+
+    <!-- 
+    NOTE: The next block of mirrors matches the second test repo by a pattern which is distinct for each mirror.
+    -->
+
+    <!-- The first match should win, so we have all later matching mirrors point to nowhere -->
+    <mirror>
+      <id>mirror-b1</id>
+      <url>@baseurl@/repo-2</url>
+      <mirrorOf>maven-core-it-b,foo-a</mirrorOf>
+    </mirror>
+    <!-- NOTE: Use multiple mirrors to reduce likelihood of random test success -->
+    <mirror>
+      <id>mirror-b2</id>
+      <url>@baseurl@/null0</url>
+      <mirrorOf>maven-core-it-b,foo-b</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-b3</id>
+      <url>@baseurl@/null1</url>
+      <mirrorOf>maven-core-it-b,foo-c</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-b4</id>
+      <url>@baseurl@/null2</url>
+      <mirrorOf>maven-core-it-b,foo-d</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-b5</id>
+      <url>@baseurl@/null3</url>
+      <mirrorOf>maven-core-it-b,foo-e</mirrorOf>
+    </mirror>
+    <mirror>
+      <id>mirror-b6</id>
+      <url>@baseurl@/null4</url>
+      <mirrorOf>maven-core-it-b,foo-f</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3974/settings.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision