From dbaaf2a5fadd4364b9656430c22f73148484b41a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 17 Aug 2017 13:28:45 +0200 Subject: [PATCH] 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 --- .../autoconfigure/freemarker/FreeMarkerAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 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 5dd6281f52..b5ce443a08 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 @@ -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 {