Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bs-62] Add integration tests for CLI samples

Browse Source 
[Fixes #48658503]
This commit is contained in:
Dave Syer
2013-04-24 16:09:17 +01:00
parent c91e83c7d2
commit 38f0cf1ed2
14 changed files with 265 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementAutoConfiguration.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.bootstrap.autoconfigure.service;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +40,7 @@ public class ManagementAutoConfiguration implements ApplicationContextAware,
private ApplicationContext parent;
private ConfigurableApplicationContext context;
@ConditionalOnExpression("${container.port} == ${container.management_port}")
@ConditionalOnExpression("${container.port:8080} == ${container.management_port:8080}")
@Configuration
@Import({ VarzAutoConfiguration.class, HealthzAutoConfiguration.class })
public static class ManagementEndpointsConfiguration {