From 1d7f7c2d28fbbf5018c9a2bea69ab4c43e3c008a Mon Sep 17 00:00:00 2001 From: Guirong Hu Date: Sat, 14 May 2022 14:46:59 +0800 Subject: [PATCH] Restore Spring Security dependency check for SpringSecurityDialect See gh-31033 --- .../autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 8e587a11f2..46b1cab634 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -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