From 3f14bdc01d2486a15c3daedd4e27c1a460c1e243 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 29 Jul 2016 14:23:12 +0200 Subject: [PATCH] Add missing type condition on JdbcTemplateAutoConfiguration Closes gh-6499 --- .../boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java index 7040e36795..aa73ae3900 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; * @since 1.4.0 */ @Configuration -@ConditionalOnClass(DataSource.class) +@ConditionalOnClass({ DataSource.class, JdbcTemplate.class }) @ConditionalOnSingleCandidate(DataSource.class) @AutoConfigureAfter(DataSourceAutoConfiguration.class) public class JdbcTemplateAutoConfiguration {