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 /archiva-modules | |
| 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 'archiva-modules')
6 files changed, 13 insertions, 14 deletions
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index f181671e3..c7f262c68 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -91,8 +91,8 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index ec7cae2f1..b76018592 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -39,6 +39,10 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-utils</artifactId> </dependency> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index de9553d23..e4d621b8e 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -98,8 +98,8 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 7f0c0e606..c786af001 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -524,6 +524,7 @@ <basedir>${basedir}</basedir> <expectedVersion>${project.version}</expectedVersion> <archiva.logMissingI18n>true</archiva.logMissingI18n> + <java.awt.headless>true</java.awt.headless> </systemPropertyVariables> </configuration> </plugin> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index d8e263e58..2b5f0c94a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -94,14 +94,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <exclusions> - <exclusion> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guava</artifactId> - </exclusion> - </exclusions> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 7c243a37c..9e98753d2 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -71,8 +71,8 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> |