maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r750651 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java resources/mng-0505/pom.xml resources/mng-0505/settings-template.xml resources/mng-0505/settings.xml
Date Thu, 05 Mar 2009 22:48:11 GMT
Author: bentmann
Date: Thu Mar  5 22:48:11 2009
New Revision: 750651

URL: http://svn.apache.org/viewvc?rev=750651&view=rev
Log:
o Moved repository declarations to settings

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml
      - copied, changed from r750393, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java?rev=750651&r1=750650&r2=750651&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
Thu Mar  5 22:48:11 2009
@@ -51,7 +51,7 @@
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
-        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()
);
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()
);
         verifier.getCliOptions().add( "--settings" );
         verifier.getCliOptions().add( "settings.xml" );
         verifier.executeGoal( "validate" );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml?rev=750651&r1=750650&r2=750651&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
Thu Mar  5 22:48:11 2009
@@ -31,19 +31,6 @@
     Test version range support.
   </description>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.mng0505</groupId>

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml
(from r750393, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml&r1=750393&r2=750651&rev=750651&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml
Thu Mar  5 22:48:11 2009
@@ -20,15 +20,25 @@
 -->
 
 <settings>
-  <!--
-  Make sure the test queries only the test repo.
-  -->
-  <mirrors>
-    <mirror>
-      <id>mng-0505</id>
-      <name>mng-0505</name>
-      <url>@baseurl@/target/null</url>
-      <mirrorOf>central</mirrorOf>
-    </mirror>
-  </mirrors>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <!-- NOTE: Override central to make sure the test queries only the test repo
-->
+          <id>central</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>



Mime
View raw message