Browse Source

SEC-1729: Fix openid4java guice dependencies to use Maven Central.

Luke Taylor 14 years ago
parent
commit
6c9ab570a2
2 changed files with 8 additions and 2 deletions
  1. 0 1
      build.gradle
  2. 8 1
      openid/openid.gradle

+ 0 - 1
build.gradle

@@ -12,7 +12,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        mavenRepo name: 'Google Guice', urls: 'http://guice-maven.googlecode.com/svn/trunk'
     }
 }
 

+ 8 - 1
openid/openid.gradle

@@ -3,12 +3,19 @@
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
-            'org.openid4java:openid4java-nodeps:0.9.6',
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-web:$springVersion"
 
+    // openid4java has a compile time dep on guice with a group
+    // name which is different from the maven central one.
+    // We use the maven central version here instead.
+    compile('org.openid4java:openid4java-nodeps:0.9.6') {
+       exclude group: 'com.google.code.guice', module: 'guice'
+    }
+    compile 'com.google.inject:guice:2.0'
+
     provided 'javax.servlet:servlet-api:2.5'
 
     runtime 'org.apache.httpcomponents:httpclient:4.1.1'