Remove guice-servlet 3.0 from the classpath.

Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/e9fa4ba3
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/e9fa4ba3
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/e9fa4ba3

Branch: refs/heads/zmanji/upgrade-guice
Commit: e9fa4ba35f8651661bcfc540a7fbe07bb3bbdc30
Parents: 9d0fc04
Author: Zameer Manji <[email protected]>
Authored: Mon Aug 31 12:59:08 2015 -0700
Committer: Zameer Manji <[email protected]>
Committed: Mon Aug 31 12:59:08 2015 -0700

----------------------------------------------------------------------
 build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/e9fa4ba3/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6de944e..f2303e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,6 +157,7 @@ project(':commons') {
     compile "com.google.code.gson:gson:${gsonRev}"
     compile "com.google.guava:guava:${guavaRev}"
     compile "com.google.inject.extensions:guice-multibindings:${guiceRev}"
+    compile "com.google.inject.extensions:guice-servlet:${guiceRev}"
     compile "com.google.inject:guice:${guiceRev}"
     compile "com.sun.jersey.contribs:jersey-guice:${jerseyRev}"
     compile "com.sun.jersey:jersey-core:${jerseyRev}"
@@ -343,7 +344,9 @@ dependencies {
   compile "com.sun.jersey:jersey-json:${jerseyRev}"
   compile "com.sun.jersey:jersey-server:${jerseyRev}"
   compile "com.sun.jersey:jersey-servlet:${jerseyRev}"
-  compile "com.sun.jersey.contribs:jersey-guice:${jerseyRev}"
+  compile("com.sun.jersey.contribs:jersey-guice:${jerseyRev}") {
+    exclude group: 'com.google.inject.extensions'
+  }
   compile 'javax.inject:javax.inject:1'
   compile "javax.servlet:servlet-api:${servletRev}"
   compile "log4j:log4j:${log4jRev}"
@@ -364,8 +367,6 @@ dependencies {
   testCompile "com.sun.jersey:jersey-client:${jerseyRev}"
   testCompile "junit:junit:${junitRev}"
 
-  configurations.compile {
-  }
 }
 
 // For normal developer builds, avoid running the often-time-consuming code 
quality checks.

Reply via email to