You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/08/13 06:47:10 UTC
svn commit: r685438 - in
/maven/components/branches/sisbell-maven-2.1-profile: ./
maven-core-it-runner/ maven-core/ maven-distribution/
maven-distribution/src/conf/ maven-embedder-integration-tests/
maven-embedder/ maven-lifecycle/ maven-model/ maven-p...
Author: sisbell
Date: Tue Aug 12 21:47:09 2008
New Revision: 685438
URL: http://svn.apache.org/viewvc?rev=685438&view=rev
Log:
Merging trunk to branch.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/build.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-core/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/src/conf/settings.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder-integration-tests/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-lifecycle/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-model/ (props changed)
maven/components/branches/sisbell-maven-2.1-profile/maven-model/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-plugin-api/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-profile/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-reporting-api/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-toolchain/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-workspace/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/pom.xml
Modified: maven/components/branches/sisbell-maven-2.1-profile/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/build.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/build.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/build.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core-it-runner/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-distribution/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-distribution/src/conf/settings.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/src/conf/settings.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/src/conf/settings.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-distribution/src/conf/settings.xml Tue Aug 12 21:47:09 2008
@@ -86,7 +86,7 @@
<password>proxypass</password>
<host>proxy.host.net</host>
<port>80</port>
- <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
</proxy>
-->
</proxies>
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-embedder-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder-integration-tests/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder-integration-tests/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder-integration-tests/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-lifecycle/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-lifecycle/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-lifecycle/pom.xml Tue Aug 12 21:47:09 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>
Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-model/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 12 21:47:09 2008
@@ -1,6 +1,7 @@
.wtpmodules
*.log
target
+target-eclipse
.classpath
.project
default.lst
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-model/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-model/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-model/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-plugin-api/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-plugin-api/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-profile/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-profile/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-profile/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-reporting-api/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-reporting-api/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-toolchain/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-toolchain/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-toolchain/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/maven-workspace/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-workspace/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-workspace/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-workspace/pom.xml Tue Aug 12 21:47:09 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/branches/sisbell-maven-2.1-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/pom.xml?rev=685438&r1=685437&r2=685438&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/pom.xml Tue Aug 12 21:47:09 2008
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<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>