SEC-1729: Updated openid module and sample to openid4java 0.9.6 and httpclient 4.1.1

config/config.gradle

@@ -13,6 +13,7 @@ configurations {
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
+            'org.openid4java:openid4java-nodeps:0.9.6',
             "org.aspectj:aspectjweaver:$aspectjVersion",
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-aop:$springVersion",
@@ -26,7 +27,6 @@ dependencies {
 
     testCompile project(':spring-security-ldap'),
                 project(':spring-security-openid'),
-                'org.openid4java:openid4java-nodeps:0.9.5',
                 project(':spring-security-core').sourceSets.test.classes,
                 'javax.annotation:jsr250-api:1.0',
                 "org.springframework.ldap:spring-ldap-core:$springLdapVersion",

docs/manual/src/docbook/appendix-dependencies.xml

@@ -358,9 +358,19 @@
                         </row>
                         <row>
                             <entry>openid4java-nodeps</entry>
-                            <entry>0.95</entry>
+                            <entry>0.9.6</entry>
                             <entry>Spring Security's OpenID integration uses OpenID4Java.</entry>
                         </row>
+                        <row>
+                            <entry>httpclient</entry>
+                            <entry>4.1.1</entry>
+                            <entry>openid4java-nodeps depends on HttpClient 4.</entry>
+                        </row>
+                        <row>
+                            <entry>guice</entry>
+                            <entry>2.0</entry>
+                            <entry>openid4java-nodeps depends on Guice 2.</entry>
+                        </row>
                     </tbody>
                 </tgroup>
             </table>

openid/openid.gradle

@@ -3,7 +3,7 @@
 dependencies {
     compile project(':spring-security-core'),
             project(':spring-security-web'),
-            'org.openid4java:openid4java-nodeps:0.9.5',
+            'org.openid4java:openid4java-nodeps:0.9.6',
             "org.springframework:spring-aop:$springVersion",
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-beans:$springVersion",
@@ -11,5 +11,9 @@ dependencies {
 
     provided 'javax.servlet:servlet-api:2.5'
 
-    runtime 'commons-httpclient:commons-httpclient:3.1'
+    runtime 'org.apache.httpcomponents:httpclient:4.1.1'
 }
+
+repositories {
+    mavenRepo name: 'Google Guice', urls: 'http://guice-maven.googlecode.com/svn/trunk'
+}