Browse Source

Fix test in FreeMarker support

pull/762/head
Dave Syer 12 years ago
parent
commit
0540cecbd4
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java

@ -93,7 +93,6 @@ public class FreeMarkerAutoConfiguration { @@ -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 { @@ -137,7 +136,7 @@ public class FreeMarkerAutoConfiguration {
}
@Bean
@ConditionalOnBean(FreeMarkerConfig.class)
@ConditionalOnBean(FreeMarkerConfigurer.class)
@ConditionalOnMissingBean
public freemarker.template.Configuration freemarkerConfiguration(
FreeMarkerConfig configurer) {

Loading…
Cancel
Save