From 0540cecbd475544d5f8002d4ff26799be55afe17 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 1 May 2014 13:40:22 +0100 Subject: [PATCH] Fix test in FreeMarker support --- .../autoconfigure/freemarker/FreeMarkerAutoConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index b0f877a25da..06fc05ff3c2 100644 --- 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 @@ -93,7 +93,6 @@ public class FreeMarkerAutoConfiguration { } @Configuration - @ConditionalOnClass(Servlet.class) @ConditionalOnNotWebApplication public static class FreeMarkerConfiguration implements EnvironmentAware { @@ -137,7 +136,7 @@ public class FreeMarkerAutoConfiguration { } @Bean - @ConditionalOnBean(FreeMarkerConfig.class) + @ConditionalOnBean(FreeMarkerConfigurer.class) @ConditionalOnMissingBean public freemarker.template.Configuration freemarkerConfiguration( FreeMarkerConfig configurer) {