maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r750836 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3461/test-1/ resources/mng-3461/test-2/ resources/mng-3461/test-3/
Date Fri, 06 Mar 2009 10:25:19 GMT
Author: bentmann
Date: Fri Mar  6 10:25:16 2009
New Revision: 750836

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

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
      - copied, changed from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml
      - copied, changed from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java?rev=750836&r1=750835&r2=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
Fri Mar  6 10:25:16 2009
@@ -118,7 +118,6 @@
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@test.port@", Integer.toString( port ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps
);
-            verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
             verifier.getCliOptions().add( "--settings" );
             verifier.getCliOptions().add( "settings.xml" );
             verifier.executeGoal( "validate" );
@@ -148,7 +147,7 @@
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
         Properties filterProps = verifier.newDefaultFilterProperties();
-        verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", filterProps );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps
);
         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-3461/test-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml?rev=750836&r1=750835&r2=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
Fri Mar  6 10:25:16 2009
@@ -40,19 +40,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>http://maven.apache.org/null</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml?rev=750836&r1=750835&r2=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
Fri Mar  6 10:25:16 2009
@@ -20,6 +20,27 @@
 -->
 
 <settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>http://maven.apache.org/null</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+
   <mirrors>
     <mirror>
       <id>test-a</id>

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
(from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml&r1=750819&r2=750836&rev=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
Fri Mar  6 10:25:16 2009
@@ -50,39 +50,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it-file</id>
-      <url>@baseurl@/repo-1</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>maven-core-it-localhost</id>
-      <url>http://localhost:@test.port@/repo-2</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>maven-core-it-ext</id>
-      <url>http://maven.apache.org/null</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml?rev=750836&r1=750835&r2=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
Fri Mar  6 10:25:16 2009
@@ -20,10 +20,52 @@
 -->
 
 <settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it-file</id>
+          <url>@baseurl@/repo-1</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+        <repository>
+          <id>maven-core-it-localhost</id>
+          <url>http://localhost:@test.port@/repo-2</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+        <repository>
+          <id>maven-core-it-ext</id>
+          <url>http://maven.apache.org/null</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+
   <mirrors>
     <mirror>
       <id>test-a</id>
       <url>@baseurl@/repo-3</url>
+      <!-- should not match anything but maven-core-it-ext -->
       <mirrorOf>external:*</mirrorOf>
     </mirror>
   </mirrors>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml?rev=750836&r1=750835&r2=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
Fri Mar  6 10:25:16 2009
@@ -40,19 +40,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>@baseurl@/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml
(from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml&r1=750819&r2=750836&rev=750836&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml
Fri Mar  6 10:25:16 2009
@@ -20,6 +20,27 @@
 -->
 
 <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>
+
   <mirrors>
     <mirror>
       <id>test-a</id>



Mime
View raw message