From cb2ad7fb87d445cda26105c750ad61f9c924bb2b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Mar 2016 11:43:58 +0100 Subject: [PATCH] Prevent Thymeleaf to be configured with Thymeleaf 3 Spring Boot does not support Thymeleaf 3 yet. This commit prevents the auto-configuration to activate if Thymeleaf 3 is available on the classpath. Closes gh-5371 --- .../autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index a564434d3a..f1d8b5fca2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -43,6 +43,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.template.TemplateLocation; @@ -68,6 +69,7 @@ import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; @Configuration @EnableConfigurationProperties(ThymeleafProperties.class) @ConditionalOnClass(SpringTemplateEngine.class) +@ConditionalOnMissingClass("org.thymeleaf.templatemode.TemplateMode") @AutoConfigureAfter(WebMvcAutoConfiguration.class) public class ThymeleafAutoConfiguration {