mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 03:43:21 +08:00
Upgrade to Spring Security 4
This commit updates Spring Boot to use Spring Security 4. As a result of this, the coordinates of Thmyeleaf's Spring Security extra, for which dependency management and auto-configuration is provided, have been updated to the Spring Security 4 variant. Closes gh-2727
This commit is contained in:
parent
d3c70fa198
commit
ba3d4e9e3c
@ -373,7 +373,7 @@ public class CrshAutoConfigurationTests {
|
||||
|
||||
@Bean
|
||||
public AccessDecisionManager shellAccessDecisionManager() {
|
||||
List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>();
|
||||
List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
|
||||
RoleVoter voter = new RoleVoter();
|
||||
voter.setRolePrefix("");
|
||||
voters.add(voter);
|
||||
|
@ -412,7 +412,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.thymeleaf.extras</groupId>
|
||||
<artifactId>thymeleaf-extras-springsecurity3</artifactId>
|
||||
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -41,7 +41,7 @@ import org.springframework.core.Ordered;
|
||||
import org.springframework.util.Assert;
|
||||
import org.thymeleaf.dialect.IDialect;
|
||||
import org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect;
|
||||
import org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect;
|
||||
import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
|
||||
import org.thymeleaf.spring4.SpringTemplateEngine;
|
||||
import org.thymeleaf.spring4.resourceresolver.SpringResourceResourceResolver;
|
||||
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
|
||||
|
@ -127,7 +127,7 @@
|
||||
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
|
||||
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
|
||||
<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
|
||||
<spring-security.version>3.2.7.RELEASE</spring-security.version>
|
||||
<spring-security.version>4.0.0.RELEASE</spring-security.version>
|
||||
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
|
||||
<spring-social.version>1.1.0.RELEASE</spring-social.version>
|
||||
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>
|
||||
@ -136,7 +136,7 @@
|
||||
<spring-ws.version>2.2.1.RELEASE</spring-ws.version>
|
||||
<sun-mail.version>${javax-mail.version}</sun-mail.version>
|
||||
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
|
||||
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
|
||||
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
|
||||
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
|
||||
<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>
|
||||
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
|
||||
@ -1562,8 +1562,8 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.thymeleaf.extras</groupId>
|
||||
<artifactId>thymeleaf-extras-springsecurity3</artifactId>
|
||||
<version>${thymeleaf-extras-springsecurity3.version}</version>
|
||||
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
|
||||
<version>${thymeleaf-extras-springsecurity4.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user