Merge branch '1.5.x'

2017-06-26 13:37:18 +02:00
parent a1ab994e70 58a1ed19a9
commit 8ea38d1cbe
2 changed files with 2 additions and 1 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@@ -262,6 +262,7 @@ public class HealthIndicatorAutoConfiguration {
 	}

 	@Configuration
+	@ConditionalOnClass(MongoTemplate.class)
 	@ConditionalOnBean(MongoTemplate.class)
 	@ConditionalOnEnabledHealthIndicator("mongo")
 	public static class MongoHealthIndicatorConfiguration extends