Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 04, 2012
@rwinch Update maven-resources-plugin to support maven 3 6b9df95
@rwinch Added .gitignore ba64fe0
@rwinch SES-98: Update Spring to 3.0.7 and Spring Security to 3.1.0
Since this has not been released yet and it has conflicts when updating to Spring Security 3.1, just update minimum requirement to 3.1.
a27623b
View
4 .gitignore
@@ -0,0 +1,4 @@
+.project
+.classpath
+.settings
+target
View
2 pom.xml
@@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
View
4 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.0.RELEASE</spring.security.version>
</properties>
</project>
View
2 ...in/java/org/springframework/security/extensions/kerberos/KerberosServiceRequestToken.java
@@ -51,7 +51,7 @@
* @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
2 ...pringframework/security/extensions/kerberos/web/SpnegoAuthenticationProcessingFilter.java
@@ -29,8 +29,8 @@
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;

No commit comments for this range

Something went wrong with that request. Please try again.