Skip to content

Commit cb2ad7f

Browse files
committed
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
1 parent 93f3921 commit cb2ad7f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
4444
import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;
4545
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
46+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
4647
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
4748
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
4849
import org.springframework.boot.autoconfigure.template.TemplateLocation;
@@ -68,6 +69,7 @@
6869
@Configuration
6970
@EnableConfigurationProperties(ThymeleafProperties.class)
7071
@ConditionalOnClass(SpringTemplateEngine.class)
72+
@ConditionalOnMissingClass("org.thymeleaf.templatemode.TemplateMode")
7173
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
7274
public class ThymeleafAutoConfiguration {
7375

0 commit comments

Comments
 (0)