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/05/17 20:06:21 UTC

svn commit: r775727 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3106/ resources/mng-3220/ resources/mng-3220/depMgmt-pom-module-notImported/ resources/mng-3220/depMgmt-pom-module-notImporte...

Author: bentmann
Date: Sun May 17 18:06:21 2009
New Revision: 775727

URL: http://svn.apache.org/viewvc?rev=775727&view=rev
Log:
o Decoupled IT from production plugins

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/parent.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/pom.xml
      - copied, changed from r775662, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/project/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/dm-pom-1.pom
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/settings-template.xml   (with props)
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/dm-pom/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/project/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/dm-pom/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/project/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3106/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java?rev=775727&r1=775726&r2=775727&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java Sun May 17 18:06:21 2009
@@ -53,12 +53,14 @@
         Verifier verifier;
 
         verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
 
         List cliOptions = new ArrayList();
         cliOptions.add( "-Dprofile1.on=true" );
 
         verifier.setCliOptions( cliOptions );
-        verifier.executeGoal( "package" );
+        verifier.executeGoal( "validate" );
 
         verifier.verifyErrorFreeLog();
         verifier.assertFilePresent( "target/profile1/touch.txt" );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java?rev=775727&r1=775726&r2=775727&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java Sun May 17 18:06:21 2009
@@ -38,21 +38,18 @@
     public void testitMNG3220a()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(),
-                                                                 "/mng-3220/imported-pom-depMgmt" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3220" );
 
-        File dmDir = new File( testDir, "dm-pom" );
-        Verifier verifier = new Verifier( dmDir.getAbsolutePath() );
+        testDir = new File( testDir, "imported-pom-depMgmt" );
 
-        verifier.executeGoal( "install" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        File projectDir = new File( testDir, "project" );
-        verifier = new Verifier( projectDir.getAbsolutePath() );
-
-        verifier.executeGoal( "package" );
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
+        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();
     }
@@ -60,18 +57,27 @@
     public void testitMNG3220b()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(),
-                                                                 "/mng-3220/depMgmt-pom-module-notImported" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3220" );
+
+        testDir = new File( testDir, "depMgmt-pom-module-notImported" );
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
+        verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( "settings.xml" );
 
         try
         {
-            verifier.executeGoal( "install" );
+            verifier.executeGoal( "validate" );
+            verifier.verifyErrorFreeLog();
             fail( "Should fail to build with missing junit version." );
         }
         catch ( VerificationException e )
         {
+            // expected
         }
 
         verifier.resetStreams();

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3106/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3106/pom.xml?rev=775727&r1=775726&r2=775727&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3106/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3106/pom.xml Sun May 17 18:06:21 2009
@@ -32,6 +32,7 @@
             <executions>
               <execution>
                 <id>profile1-touch</id>
+                <phase>validate</phase>
                 <goals>
                   <goal>touch</goal>
                 </goals>
@@ -63,6 +64,7 @@
             <executions>
               <execution>
                 <id>profile2-touch</id>
+                <phase>validate</phase>
                 <goals>
                   <goal>touch</goal>
                 </goals>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/pom.xml?rev=775727&r1=775726&r2=775727&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/depMgmt-pom-module-notImported/pom.xml Sun May 17 18:06:21 2009
@@ -1,24 +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.
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3220.2</groupId>
-  <artifactId>parent</artifactId>
-  <packaging>pom</packaging>
+
+  <groupId>org.apache.maven.its.mng3220</groupId>
+  <artifactId>project</artifactId>
   <version>1</version>
-  
-  <modules>
-    <module>dm-pom</module>
-    <module>project</module>
-  </modules>
-  
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3220</name>
+  <description>
+    Verify that the dependency management from a dependency of type "pom" but without scope "import" does not
+    contribute to this project's dependency management.
+  </description>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.maven.its.mng3220.2</groupId>
+        <groupId>org.apache.maven.its.mng3220</groupId>
         <artifactId>dm-pom</artifactId>
         <version>1</version>
         <type>pom</type>
+        <!-- NOTE: Not using "import" scope here is the essential part of this test. -->
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/parent.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/parent.xml?rev=775727&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/parent.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/parent.xml Sun May 17 18:06:21 2009
@@ -0,0 +1,48 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3220</groupId>
+  <artifactId>parent</artifactId>
+  <version>1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3220</name>
+  <description>
+    Verify that the dependency management from a dependency of type "pom" and with scope "import" contributes to
+    this project's dependency management.
+  </description>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.its.mng3220</groupId>
+        <artifactId>dm-pom</artifactId>
+        <version>1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>

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

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

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/pom.xml (from r775662, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/project/pom.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/project/pom.xml&r1=775662&r2=775727&rev=775727&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/imported-pom-depMgmt/pom.xml Sun May 17 18:06:21 2009
@@ -1,28 +1,51 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3220.1</groupId>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3220</groupId>
+    <artifactId>parent</artifactId>
+    <version>1</version>
+    <relativePath>parent.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.maven.its.mng3220</groupId>
   <artifactId>project</artifactId>
-  <packaging>jar</packaging>
   <version>1</version>
-  
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.its.mng3220.1</groupId>
-        <artifactId>dm-pom</artifactId>
-        <version>1</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3220</name>
+  <description>
+    Verify that the dependency management from a dependency of type "pom" and with scope "import" contributes to
+    this project's dependency management.
+  </description>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <!-- Version should be managed by imported POM -->
     </dependency>
   </dependencies>
 </project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/dm-pom-1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/dm-pom-1.pom?rev=775727&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/dm-pom-1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/1/dm-pom-1.pom Sun May 17 18:06:21 2009
@@ -0,0 +1,47 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3220</groupId>
+  <artifactId>dm-pom</artifactId>
+  <version>1</version>
+  <packaging>pom</packaging>
+  
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <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-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml?rev=775727&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml Sun May 17 18:06:21 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <groupId>org.apache.maven.its.mng3220</groupId>
+  <artifactId>dm-pom</artifactId>
+  <version>1</version>
+  <versioning>
+    <versions>
+      <version>1</version>
+    </versions>
+    <lastUpdated>20090517172816</lastUpdated>
+  </versioning>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/repo/org/apache/maven/its/mng3220/dm-pom/maven-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/settings-template.xml?rev=775727&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3220/settings-template.xml Sun May 17 18:06:21 2009
@@ -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>

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

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