You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/24 13:18:31 UTC
svn commit: r988484 - in /maven/maven-3/trunk: apache-maven/pom.xml
maven-compat/pom.xml maven-core/pom.xml maven-embedder/pom.xml
maven-model-builder/pom.xml maven-plugin-api/pom.xml pom.xml
Author: bentmann
Date: Tue Aug 24 11:18:30 2010
New Revision: 988484
URL: http://svn.apache.org/viewvc?rev=988484&view=rev
Log:
[MNG-4749] Move from Plexus to Guice as IoC container
Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/maven-compat/pom.xml
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-embedder/pom.xml
maven/maven-3/trunk/maven-model-builder/pom.xml
maven/maven-3/trunk/maven-plugin-api/pom.xml
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Tue Aug 24 11:18:30 2010
@@ -43,8 +43,8 @@
<artifactId>maven-compat</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
</dependency>
<!-- CLI -->
<dependency>
Modified: maven/maven-3/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/pom.xml (original)
+++ maven/maven-3/trunk/maven-compat/pom.xml Tue Aug 24 11:18:30 2010
@@ -53,8 +53,8 @@
<artifactId>plexus-interpolation</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Tue Aug 24 11:18:30 2010
@@ -55,8 +55,8 @@
</dependency>
<!-- Plexus -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/maven-3/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/pom.xml (original)
+++ maven/maven-3/trunk/maven-embedder/pom.xml Tue Aug 24 11:18:30 2010
@@ -54,8 +54,8 @@
<artifactId>plexus-classworlds</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/maven-3/trunk/maven-model-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/pom.xml (original)
+++ maven/maven-3/trunk/maven-model-builder/pom.xml Tue Aug 24 11:18:30 2010
@@ -41,8 +41,8 @@
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/pom.xml (original)
+++ maven/maven-3/trunk/maven-plugin-api/pom.xml Tue Aug 24 11:18:30 2010
@@ -48,8 +48,8 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
</dependency>
</dependencies>
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=988484&r1=988483&r2=988484&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Tue Aug 24 11:18:30 2010
@@ -44,6 +44,7 @@
<plexusVersion>1.5.4</plexusVersion>
<plexusInterpolationVersion>1.11</plexusInterpolationVersion>
<plexusUtilsVersion>2.0.4</plexusUtilsVersion>
+ <spiceInjectVersion>1.3.3</spiceInjectVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.4</cipherVersion>
@@ -237,15 +238,9 @@
<version>${plexusUtilsVersion}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>${plexusVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-inject-plexus</artifactId>
+ <version>${spiceInjectVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>