Merge branch 'master' into 2.0.x

2017-06-30 20:20:16 -06:00
parent 80b91d0a03 2aa6c39322
commit f34498228d
1 changed files with 1 additions and 0 deletions
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
@@ -42,6 +42,7 @@ import org.springframework.context.annotation.Configuration;
 *
 */
@Configuration
+@ConditionalOnClass(EnvironmentEndpoint.class)
@ConditionalOnWebApplication
 //TODO: support reactive
@AutoConfigureAfter({ WebMvcAutoConfiguration.class,