You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/07/26 06:23:14 UTC

svn commit: r679951 - in /maven/components/branches/MNG-2477: ./ maven-core-it-runner/ maven-core/ maven-distribution/ maven-distribution/src/conf/ maven-embedder-integration-tests/ maven-embedder/ maven-lifecycle/ maven-model/ maven-plugin-api/ maven-...

Author: brett
Date: Fri Jul 25 21:23:13 2008
New Revision: 679951

URL: http://svn.apache.org/viewvc?rev=679951&view=rev
Log:
set up so that it can be run in parallel to a trunk installation

Modified:
    maven/components/branches/MNG-2477/maven-core-it-runner/pom.xml
    maven/components/branches/MNG-2477/maven-core/pom.xml
    maven/components/branches/MNG-2477/maven-distribution/pom.xml
    maven/components/branches/MNG-2477/maven-distribution/src/conf/settings.xml
    maven/components/branches/MNG-2477/maven-embedder-integration-tests/pom.xml
    maven/components/branches/MNG-2477/maven-embedder/pom.xml
    maven/components/branches/MNG-2477/maven-lifecycle/pom.xml
    maven/components/branches/MNG-2477/maven-model/pom.xml
    maven/components/branches/MNG-2477/maven-plugin-api/pom.xml
    maven/components/branches/MNG-2477/maven-profile/pom.xml
    maven/components/branches/MNG-2477/maven-project/pom.xml
    maven/components/branches/MNG-2477/maven-reporting-api/pom.xml
    maven/components/branches/MNG-2477/maven-toolchain/pom.xml
    maven/components/branches/MNG-2477/maven-workspace/pom.xml
    maven/components/branches/MNG-2477/pom.xml

Modified: maven/components/branches/MNG-2477/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-core-it-runner/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-core-it-runner/pom.xml Fri Jul 25 21:23:13 2008
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <artifactId>maven-core-it-runner</artifactId>
   <name>Integration Test Executor</name>
@@ -52,7 +52,7 @@
           <systemProperties>
             <property>
               <name>maven.home</name>
-              <value>${basedir}/target/maven-installation/apache-maven-2.1-SNAPSHOT</value>
+              <value>${basedir}/target/maven-installation/apache-maven-2.1-PGP-SNAPSHOT</value>
             </property>
             <property>
               <name>maven.test.tmpdir</name>
@@ -92,7 +92,7 @@
           <execution>
             <configuration>
               <tasks>
-                <chmod file="${basedir}/target/maven-installation/apache-maven-2.1-SNAPSHOT/bin/mvn" perm="755"/>
+                <chmod file="${basedir}/target/maven-installation/apache-maven-2.1-PGP-SNAPSHOT/bin/mvn" perm="755"/>
               </tasks>
             </configuration>
             <phase>process-sources</phase>

Modified: maven/components/branches/MNG-2477/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-core/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-core/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-core/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

Modified: maven/components/branches/MNG-2477/maven-distribution/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-distribution/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-distribution/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-distribution/pom.xml Fri Jul 25 21:23:13 2008
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <artifactId>maven-distribution</artifactId>
   <name>Maven Distribution</name>
@@ -245,4 +245,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: maven/components/branches/MNG-2477/maven-distribution/src/conf/settings.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-distribution/src/conf/settings.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-distribution/src/conf/settings.xml (original)
+++ maven/components/branches/MNG-2477/maven-distribution/src/conf/settings.xml Fri Jul 25 21:23:13 2008
@@ -51,6 +51,7 @@
    | Default: ~/.m2/repository
   <localRepository>/path/to/local/repo</localRepository>
   -->
+  <localRepository>${user.home}/.m2/repository-gpg</localRepository>
 
   <!-- interactiveMode
    | This will determine whether maven prompts you when it needs input. If set to false,

Modified: maven/components/branches/MNG-2477/maven-embedder-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder-integration-tests/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder-integration-tests/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-embedder-integration-tests/pom.xml Fri Jul 25 21:23:13 2008
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1-PGP-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-embedder-integration-tests</artifactId>

Modified: maven/components/branches/MNG-2477/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-embedder/pom.xml Fri Jul 25 21:23:13 2008
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <artifactId>maven-embedder</artifactId>
   <name>Maven Embedder</name>
@@ -124,4 +124,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: maven/components/branches/MNG-2477/maven-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-lifecycle/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-lifecycle/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-lifecycle/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-lifecycle</artifactId>

Modified: maven/components/branches/MNG-2477/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-model/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-model/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-model/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-model</artifactId>

Modified: maven/components/branches/MNG-2477/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-plugin-api/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-plugin-api/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/MNG-2477/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-profile/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-profile/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-profile/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-profile</artifactId>

Modified: maven/components/branches/MNG-2477/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-project/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-project/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-project/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-project</artifactId>

Modified: maven/components/branches/MNG-2477/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-reporting-api/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-reporting-api/pom.xml Fri Jul 25 21:23:13 2008
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/MNG-2477/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-toolchain/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-toolchain/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-toolchain/pom.xml Fri Jul 25 21:23:13 2008
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-toolchain</artifactId>
@@ -55,4 +55,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

Modified: maven/components/branches/MNG-2477/maven-workspace/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-workspace/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-workspace/pom.xml (original)
+++ maven/components/branches/MNG-2477/maven-workspace/pom.xml Fri Jul 25 21:23:13 2008
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1-PGP-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-workspace</artifactId>
@@ -29,4 +29,4 @@
       <artifactId>plexus-container-default</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: maven/components/branches/MNG-2477/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/pom.xml?rev=679951&r1=679950&r2=679951&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/pom.xml (original)
+++ maven/components/branches/MNG-2477/pom.xml Fri Jul 25 21:23:13 2008
@@ -23,7 +23,7 @@
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <artifactId>maven</artifactId>
-  <version>2.1-SNAPSHOT</version>
+  <version>2.1-PGP-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Maven</name>
   <description>Maven is a project development management and