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

Improve conditions on FreeMarkerWebConfiguration 

This commit makes sure to prevent the Freemarker web auto-configuration
to kick in if `spring-webmvc` is not on the classpath.

Closes gh-10027
This commit is contained in:
Stephane Nicoll 2017-08-17 13:28:45 +02:00
parent cbc3c8f496
commit dbaaf2a5fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -129,7 +129,7 @@ public class FreeMarkerAutoConfiguration {
}
@Configuration
@ConditionalOnClass(Servlet.class)
@ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class })
@ConditionalOnWebApplication
public static class FreeMarkerWebConfiguration extends FreeMarkerConfiguration {