From 6c9ab570a220282735352f914ab65d1b7d1146ea Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 27 Apr 2011 22:08:34 +0100
Subject: [PATCH] SEC-1729: Fix openid4java guice dependencies to use Maven
 Central.

---
 build.gradle         | 1 -
 openid/openid.gradle | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 493c2bda9b..e1807c58d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        mavenRepo name: 'Google Guice', urls: 'http://guice-maven.googlecode.com/svn/trunk'
     }
 }
 
diff --git a/openid/openid.gradle b/openid/openid.gradle
index 4a9766fd3e..77d7ea5e9e 100644
--- a/openid/openid.gradle
+++ b/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'