From 685adcf45304c32541cd387d7759003019653286 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gmail.com>
Date: Tue, 3 Apr 2012 21:24:17 -0500
Subject: [PATCH] SES-98: Update Spring to 3.0.7 and Spring Security to 3.1.2

---
 .gitignore                                                    | 1 +
 spring-security-kerberos-core/pom.xml                         | 4 ++--
 .../extensions/kerberos/KerberosServiceRequestToken.java      | 2 +-
 .../kerberos/web/SpnegoAuthenticationProcessingFilter.java    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f97022
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/spring-security-kerberos-core/pom.xml b/spring-security-kerberos-core/pom.xml
index da9e815..791f77c 100644
--- a/spring-security-kerberos-core/pom.xml
+++ b/spring-security-kerberos-core/pom.xml
@@ -65,7 +65,7 @@
 		</dependency>
 	</dependencies>
 	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
-		<spring.security.version>3.0.5.RELEASE</spring.security.version>
+		<spring.version>3.0.7.RELEASE</spring.version>
+		<spring.security.version>3.1.2.RELEASE</spring.security.version>
 	</properties>
 </project>
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
index dd1df7a..f083a2c 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
@@ -51,7 +51,7 @@ public class KerberosServiceRequestToken extends AbstractAuthenticationToken {
      * @param token the Kerberos/SPNEGO token
      * @see UserDetails
      */
-    public KerberosServiceRequestToken(Object principal, Collection<GrantedAuthority> authorities, byte[] token) {
+    public KerberosServiceRequestToken(Object principal, Collection<? extends GrantedAuthority> authorities, byte[] token) {
         super(authorities);
         this.token = token;
         this.principal = principal;
diff --git a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java b/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
index 89713df..8864387 100644
--- a/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
+++ b/spring-security-kerberos-core/src/main/java/org/springframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
@@ -29,8 +29,8 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.codec.Base64;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.extensions.kerberos.KerberosServiceAuthenticationProvider;
 import org.springframework.security.extensions.kerberos.KerberosServiceRequestToken;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;