Merge branch '1.4.x' into 1.5.x

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java

@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.session;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -33,10 +34,12 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt
  * @author Tommy Ludwig
  * @author Eddú Meléndez
  * @author Stephane Nicoll
+ * @author Vedran Pavic
  */
 @Configuration
+@ConditionalOnClass(RedisTemplate.class)
 @ConditionalOnMissingBean(SessionRepository.class)
-@ConditionalOnBean({ RedisTemplate.class, RedisConnectionFactory.class })
+@ConditionalOnBean(RedisConnectionFactory.class)
 @Conditional(SessionCondition.class)
 class RedisSessionConfiguration {