Skip to content

S
spring-boot
Commit c6aaa3b7 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge pull request #16341 from koziolk 

* pr/16341:
  Add missing class condition on thymeleaf-spring5
parents b7bca872 17c0214c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View file @ c6aaa3b7
...@@ -77,7 +77,7 @@ import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; ...@@ -77,7 +77,7 @@ import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
*/ */
@Configuration @Configuration
@EnableConfigurationProperties(ThymeleafProperties.class) @EnableConfigurationProperties(ThymeleafProperties.class)
@ConditionalOnClass(TemplateMode.class) @ConditionalOnClass({ TemplateMode.class, SpringTemplateEngine.class })
@AutoConfigureAfter({ WebMvcAutoConfiguration.class, WebFluxAutoConfiguration.class }) @AutoConfigureAfter({ WebMvcAutoConfiguration.class, WebFluxAutoConfiguration.class })
public class ThymeleafAutoConfiguration { public class ThymeleafAutoConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment