You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/04/25 15:19:19 UTC
svn commit: r1475752 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-common/
archiva-modules/archiva-base/archiva-indexer/
archiva-modules/archiva-base/archiva-plexus-bridge/
archiva-modules/archiva-base/archiva-proxy/ archiva-modules/arch...
Author: olamy
Date: Thu Apr 25 13:19:19 2013
New Revision: 1475752
URL: http://svn.apache.org/r1475752
Log:
use inject plexus from eclipse
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml Thu Apr 25 13:19:19 2013
@@ -53,8 +53,8 @@
<version>2.7.0</version>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Thu Apr 25 13:19:19 2013
@@ -87,8 +87,8 @@
<artifactId>indexer-core</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml Thu Apr 25 13:19:19 2013
@@ -35,8 +35,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Thu Apr 25 13:19:19 2013
@@ -94,8 +94,8 @@
<artifactId>ant</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Apr 25 13:19:19 2013
@@ -79,8 +79,8 @@
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Thu Apr 25 13:19:19 2013
@@ -67,8 +67,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1475752&r1=1475751&r2=1475752&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Apr 25 13:19:19 2013
@@ -95,7 +95,7 @@
<!-- restore when we will be able to use a derby in memory database -->
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
- <sisu-inject-plexus.version>2.3.1</sisu-inject-plexus.version>
+ <sisu-inject-plexus.version>0.0.0.M2a</sisu-inject-plexus.version>
<sisu-guice.version>3.1.2</sisu-guice.version>
<plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>2.0</plexus-expression-evaluator.version>
@@ -461,8 +461,8 @@
-->
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisu-inject-plexus.version}</version>
</dependency>
<dependency>