root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix spring-security versions 

Closes gh-3050
This commit is contained in:
Andreas Ahlenstorf 2015-05-27 13:49:15 +02:00 committed by Stephane Nicoll
parent b838513fda
commit 9805643e41
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2014 the original author or authors. * Copyright 2012-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -60,6 +60,7 @@ import static org.junit.Assert.assertTrue;
* Tests for {@link CrshAutoConfiguration}. * Tests for {@link CrshAutoConfiguration}.
* *
* @author Christian Dupuis * @author Christian Dupuis
* @author Andreas Ahlenstorf
*/ */
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public class CrshAutoConfigurationTests { public class CrshAutoConfigurationTests {
@ -373,12 +374,11 @@ public class CrshAutoConfigurationTests {
@Bean @Bean
public AccessDecisionManager shellAccessDecisionManager() { public AccessDecisionManager shellAccessDecisionManager() {
List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>(); List<AccessDecisionVoter<?>> voters = new ArrayList<AccessDecisionVoter<?>>();
RoleVoter voter = new RoleVoter(); RoleVoter voter = new RoleVoter();
voter.setRolePrefix(""); voter.setRolePrefix("");
voters.add(voter); voters.add(voter);
AccessDecisionManager result = new UnanimousBased(voters); return new UnanimousBased(voters);
return result;
} }
} }

4
spring-boot-dependencies/pom.xml
View File

@ -131,13 +131,11 @@
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version> <spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
<spring-security.version>4.0.1.RELEASE</spring-security.version> <spring-security.version>4.0.1.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version> <spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
<spring-security-oauth2.version>2.0.7.RELEASE</spring-security-oauth2.version>
<spring-social.version>1.1.2.RELEASE</spring-social.version> <spring-social.version>1.1.2.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.1.RELEASE</spring-social-facebook.version> <spring-social-facebook.version>2.0.1.RELEASE</spring-social-facebook.version>
<spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version> <spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version>
<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version> <spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<spring-security-oauth2.version>2.0.7.RELEASE</spring-security-oauth2.version>
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
<spring-ws.version>2.2.1.RELEASE</spring-ws.version> <spring-ws.version>2.2.1.RELEASE</spring-ws.version>
<statsd-client.version>3.1.0</statsd-client.version> <statsd-client.version>3.1.0</statsd-client.version>
<sendgrid.version>2.1.0</sendgrid.version> <sendgrid.version>2.1.0</sendgrid.version>