Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use inject plexus from eclipse 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1475752 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-04-25 13:19:19 +00:00
parent df1ec808de
commit d287c744b4
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-common/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-indexer/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -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>

4
archiva-modules/plugins/maven2-repository/pom.xml
View File

@ -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>

6
pom.xml
View File

@ -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>