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

use guice from google 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1512683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-08-10 12:56:05 +00:00
parent b21c11e177
commit c809f0249b
7 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,8 +91,8 @@
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.sisu</groupId> <groupId>com.google.inject</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>guice</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>

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

@ -38,6 +38,10 @@
<groupId>org.eclipse.sisu</groupId> <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback.components</groupId> <groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-utils</artifactId> <artifactId>spring-utils</artifactId>

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

@ -98,8 +98,8 @@
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.sisu</groupId> <groupId>com.google.inject</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>guice</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>

1
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -524,6 +524,7 @@
<basedir>${basedir}</basedir> <basedir>${basedir}</basedir>
<expectedVersion>${project.version}</expectedVersion> <expectedVersion>${project.version}</expectedVersion>
<archiva.logMissingI18n>true</archiva.logMissingI18n> <archiva.logMissingI18n>true</archiva.logMissingI18n>
<java.awt.headless>true</java.awt.headless>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

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

@ -94,14 +94,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.sisu</groupId> <groupId>com.google.inject</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>guice</artifactId>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guava</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>

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

@ -71,8 +71,8 @@
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.sisu</groupId> <groupId>com.google.inject</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>guice</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>

15
pom.xml
View File

@ -96,7 +96,6 @@
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
<sisu-inject-plexus.version>0.0.0.M2a</sisu-inject-plexus.version> <sisu-inject-plexus.version>0.0.0.M2a</sisu-inject-plexus.version>
<sisu-guice.version>3.1.4</sisu-guice.version>
<plexus-digest.version>1.1</plexus-digest.version> <plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>2.0</plexus-expression-evaluator.version> <plexus-expression-evaluator.version>2.0</plexus-expression-evaluator.version>
<plexus-utils.version>3.0.8</plexus-utils.version> <plexus-utils.version>3.0.8</plexus-utils.version>
@ -475,11 +474,17 @@
<groupId>org.eclipse.sisu</groupId> <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisu-inject-plexus.version}</version> <version>${sisu-inject-plexus.version}</version>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>org.sonatype.sisu</groupId> <groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>sisu-guice</artifactId>
<version>${sisu-guice.version}</version> </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.0-beta</version>
</dependency> </dependency>
<dependency> <dependency>
@ -1554,7 +1559,7 @@
<exclude>log4j:log4j</exclude> <exclude>log4j:log4j</exclude>
<exclude>org.sonatype.sisu:sisu-guava</exclude> <exclude>org.sonatype.sisu:sisu-guava</exclude>
<exclude>org.sonatype.sisu:sisu-guice</exclude>
<!-- <!--
<exclude>org.slf4j:jcl-over-slf4j</exclude> <exclude>org.slf4j:jcl-over-slf4j</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-log4j12</exclude>