Merge branch '1.5.x'

2017-08-17 13:29:24 +02:00 · 2017-08-17 13:29:24 +02:00 · 30014785a4
parent ad3a14141f dbaaf2a5fa
commit 30014785a4
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
@ -130,7 +130,7 @@ public class FreeMarkerAutoConfiguration {
 	}

 	@Configuration
-	@ConditionalOnClass(Servlet.class)
+	@ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class })
 	@ConditionalOnWebApplication(type = Type.SERVLET)
 	public static class FreeMarkerWebConfiguration extends FreeMarkerConfiguration {