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

Merge pull request #31033 from terminux 

* gh-31033:
  Restore Spring Security dependency check for SpringSecurityDialect

Closes gh-31033
This commit is contained in:
Andy Wilkinson 2022-05-18 13:16:41 +01:00
parent 96c2d08fc4 1d7f7c2d28
commit 0ee05ba582
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@ -53,6 +53,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.Ordered;
import org.springframework.security.web.server.csrf.CsrfToken;
import org.springframework.util.MimeType;
import org.springframework.util.unit.DataSize;
import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
@ -239,7 +240,7 @@ public class ThymeleafAutoConfiguration {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ SpringSecurityDialect.class })
@ConditionalOnClass({ SpringSecurityDialect.class, CsrfToken.class })
static class ThymeleafSecurityDialectConfiguration {
@Bean