diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-08-10 12:56:05 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-08-10 12:56:05 +0000 |
| commit | c809f0249bc3575788b7e8a40c1dd5f180d867d4 (patch) | |
| tree | f92982ab89c349265997df7f13e8eb296a809697 /pom.xml | |
| parent | b21c11e17714cabfd088d0e28962b6e5d4abd557 (diff) | |
| download | archiva-c809f0249bc3575788b7e8a40c1dd5f180d867d4.tar.gz archiva-c809f0249bc3575788b7e8a40c1dd5f180d867d4.zip | |
use guice from google
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1512683 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -96,7 +96,6 @@ <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> <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-expression-evaluator.version>2.0</plexus-expression-evaluator.version> <plexus-utils.version>3.0.8</plexus-utils.version> @@ -475,11 +474,17 @@ <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.plexus</artifactId> <version>${sisu-inject-plexus.version}</version> + <exclusions> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <version>${sisu-guice.version}</version> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>4.0-beta</version> </dependency> <dependency> @@ -1554,7 +1559,7 @@ <exclude>log4j:log4j</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:slf4j-log4j12</exclude> |