Author: jvanzyl
Date: Mon Aug 11 16:05:20 2008
New Revision: 684975
URL: http://svn.apache.org/viewvc?rev=684975&view=rev
Log:
o updating to 3.0-SNAPSHOT
o aparently when we start from scratch the bootstrap wasn't working, so the
maven ant tasks will now igore trying to download the projects we
are actually trying to build.
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-core-it-runner/pom.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-distribution/pom.xml
maven/components/trunk/maven-embedder-integration-tests/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-lifecycle/pom.xml
maven/components/trunk/maven-model/pom.xml
maven/components/trunk/maven-plugin-api/pom.xml
maven/components/trunk/maven-profile/pom.xml
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-reporting-api/pom.xml
maven/components/trunk/maven-toolchain/pom.xml
maven/components/trunk/maven-workspace/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Mon Aug 11 16:05:20 2008
@@ -81,7 +81,7 @@
<!-- Pull the dependencies for Modello -->
<artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset"
verbose="${verbose}">
<localRepository path="${maven.repo.local}"/>
- <dependency groupId="org.codehaus.modello"
artifactId="modello-maven-plugin" version="1.0-alpha-17"/>
+ <dependency groupId="org.codehaus.modello"
artifactId="modello-maven-plugin" version="1.0-alpha-20"/>
</artifact:dependencies>
</target>
Modified: maven/components/trunk/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-runner/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-runner/pom.xml (original)
+++ maven/components/trunk/maven-core-it-runner/pom.xml Mon Aug 11 16:05:20 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-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-3.0-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-3.0-SNAPSHOT/bin/mvn"
perm="755"/>
</tasks>
</configuration>
<phase>process-sources</phase>
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: maven/components/trunk/maven-distribution/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-distribution/pom.xml (original)
+++ maven/components/trunk/maven-distribution/pom.xml Mon Aug 11 16:05:20 2008
@@ -19,7 +19,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>maven-distribution</artifactId>
<name>Maven Distribution</name>
Modified: maven/components/trunk/maven-embedder-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder-integration-tests/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder-integration-tests/pom.xml (original)
+++ maven/components/trunk/maven-embedder-integration-tests/pom.xml Mon Aug 11
16:05:20 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-embedder-integration-tests</artifactId>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Mon Aug 11 16:05:20 2008
@@ -19,7 +19,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
Modified: maven/components/trunk/maven-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-lifecycle/pom.xml (original)
+++ maven/components/trunk/maven-lifecycle/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-lifecycle</artifactId>
Modified: maven/components/trunk/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-model/pom.xml (original)
+++ maven/components/trunk/maven-model/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-model</artifactId>
Modified: maven/components/trunk/maven-plugin-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/pom.xml (original)
+++ maven/components/trunk/maven-plugin-api/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-api</artifactId>
Modified: maven/components/trunk/maven-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-profile/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/pom.xml (original)
+++ maven/components/trunk/maven-profile/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-profile</artifactId>
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-project</artifactId>
Modified: maven/components/trunk/maven-reporting-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-reporting-api/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting-api/pom.xml (original)
+++ maven/components/trunk/maven-reporting-api/pom.xml Mon Aug 11 16:05:20 2008
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-reporting-api</artifactId>
Modified: maven/components/trunk/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/pom.xml (original)
+++ maven/components/trunk/maven-toolchain/pom.xml Mon Aug 11 16:05:20 2008
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-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/trunk/maven-workspace/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-workspace/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/maven-workspace/pom.xml (original)
+++ maven/components/trunk/maven-workspace/pom.xml Mon Aug 11 16:05:20 2008
@@ -18,7 +18,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=684975&r1=684974&r2=684975&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Aug 11 16:05:20 2008
@@ -23,7 +23,7 @@
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<artifactId>maven</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
<description>Maven is a project development management and
@@ -289,6 +289,7 @@
<!--end-->
<dependencies>
<!-- Maven Modules -->
+ <!--start-->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-workspace</artifactId>
@@ -339,6 +340,7 @@
<artifactId>maven-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <!--end-->
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
