From 06017f688aa37f4317e10968ff6b4e4432ada2ca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 7 Feb 2017 16:17:05 +0000 Subject: [PATCH] Only auto-configure SpringSocialDialect for Thymeleaf 2 Previously, SocialWebAutoConfiguration would create a SpringSocialDialect bean when SpringTemplateEngine was on the classpath. This class exists in both Thymeleaf 2 and Thymeleaf 3 but SpringSocialDialect is only compatible with Thymeleaf 2. This commit updates the auto-configuration to require SpringResourceResourceResolver to be on the classpath. This class exists in Thymeleaf 2 but does not exist in Thymeleaf 3. Closes gh-4858 --- .../autoconfigure/social/SocialWebAutoConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java index 0a76f81f1a..37e1a7f233 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.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. @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.social; import java.util.List; -import org.thymeleaf.spring4.SpringTemplateEngine; +import org.thymeleaf.spring4.resourceresolver.SpringResourceResourceResolver; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -164,7 +164,7 @@ public class SocialWebAutoConfiguration { } @Configuration - @ConditionalOnClass(SpringTemplateEngine.class) + @ConditionalOnClass(SpringResourceResourceResolver.class) protected static class SpringSocialThymeleafConfig { @Bean