From 7101b5099f8571f42b9c8c23232dd4e1e34b14cd Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 28 Mar 2022 16:46:48 -0400 Subject: [PATCH] Make MustacheViewResolver bean back off without Spring MVC See gh-30456 --- .../autoconfigure/mustache/MustacheServletWebConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java index 0ff0462802a4..03852a80e807 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java @@ -18,6 +18,7 @@ import com.samskivert.mustache.Mustache.Compiler; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; @@ -29,6 +30,7 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) +@ConditionalOnClass(MustacheViewResolver.class) class MustacheServletWebConfiguration { @Bean