SES-98: Update Spring to 3.0.7 and Spring Security to 3.1.2

This commit is contained in:
Rob Winch
2012-04-03 21:24:17 -05:00
committed by Luke Taylor
parent be30bc620c
commit 685adcf453
4 changed files with 5 additions and 4 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
target/

View File

@@ -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>

View File

@@ -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;

View File

@@ -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;