root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix test in FreeMarker support

This commit is contained in:
Dave Syer 2014-05-01 13:40:22 +01:00
parent b12631d75d
commit 0540cecbd4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,6 @@ public class FreeMarkerAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(Servlet.class)
@ConditionalOnNotWebApplication @ConditionalOnNotWebApplication
public static class FreeMarkerConfiguration implements EnvironmentAware { public static class FreeMarkerConfiguration implements EnvironmentAware {
@ -137,7 +136,7 @@ public class FreeMarkerAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnBean(FreeMarkerConfig.class) @ConditionalOnBean(FreeMarkerConfigurer.class)
@ConditionalOnMissingBean @ConditionalOnMissingBean
public freemarker.template.Configuration freemarkerConfiguration( public freemarker.template.Configuration freemarkerConfiguration(
FreeMarkerConfig configurer) { FreeMarkerConfig configurer) {