Merge branch '2.6.x' into 2.7.x

Closes gh-28980
spring-projects · Dec 10, 2021 · b961b14 · b961b14
2 parents f5750e3 + dfab6ee
commit b961b14
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -58,6 +58,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 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;
@@ -279,7 +280,7 @@ DataAttributeDialect dialect() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass({ SpringSecurityDialect.class })
+	@ConditionalOnClass({ SpringSecurityDialect.class, CsrfToken.class })
 	static class ThymeleafSecurityDialectConfiguration {
 
 		@Bean