Merge branch '1.5.x'

snicoll · snicoll · commit 30014785a402 · 2017-08-17T13:29:24.000+02:00
diff --git 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 FreeMarkerConfigurationFactoryBean freeMarkerConfiguration() {
 	}
 
 	@Configuration
-	@ConditionalOnClass(Servlet.class)
+	@ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class })
 	@ConditionalOnWebApplication(type = Type.SERVLET)
 	public static class FreeMarkerWebConfiguration extends FreeMarkerConfiguration {
 

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public FreeMarkerConfigurationFactoryBean freeMarkerConfiguration() {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@Configuration`
`133`		`- @ConditionalOnClass(Servlet.class)`
	`133`	`+ @ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class })`
`134`	`134`	`@ConditionalOnWebApplication(type = Type.SERVLET)`
`135`	`135`	`public static class FreeMarkerWebConfiguration extends FreeMarkerConfiguration {`
`136`	`136`