Updates to boot 2.0 compatibility

spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java

@@ -34,7 +34,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * @author Spencer Gibb
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = ServiceRegistryEndpointTests.TestConfiguration.class, properties = "endpoints.default.web.enabled=true")
+@SpringBootTest(classes = ServiceRegistryEndpointTests.TestConfiguration.class, properties = "management.endpoints.web.expose=*")
 public class ServiceRegistryEndpointTests {
 	private static final String UPDATED_STATUS = "updatedstatus";
 	private static final String MYSTATUS = "mystatus";

spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentWebEndpointExtension.java

@@ -15,14 +15,14 @@
  */
 package org.springframework.cloud.context.environment;
 
-import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
-import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
-import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointExtension;
-import org.springframework.boot.actuate.env.EnvironmentEndpoint;
-
 import java.util.Collections;
 import java.util.Map;
 
+import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
+import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
+import org.springframework.boot.actuate.endpoint.web.annotation.EndpointWebExtension;
+import org.springframework.boot.actuate.env.EnvironmentEndpoint;
+
 
 /**
  * MVC endpoint for the {@link EnvironmentManager} providing a POST to /env as a simple
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author Dave Syer
  * 
  */
-@WebEndpointExtension(endpoint = EnvironmentEndpoint.class)
+@EndpointWebExtension(endpoint = EnvironmentEndpoint.class)
 public class EnvironmentWebEndpointExtension {
 
 	private EnvironmentManager environment;

spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java

@@ -29,8 +29,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.integration.monitor.IntegrationMBeanExporter;
 import org.springframework.util.ClassUtils;
 
-import static org.springframework.boot.actuate.endpoint.DefaultEnablement.DISABLED;
-
 /**
  * An endpoint that restarts the application context. Install as a bean and also register
  * a {@link RestartListener} with the {@link SpringApplication} that starts the context.
@@ -40,7 +38,7 @@ import static org.springframework.boot.actuate.endpoint.DefaultEnablement.DISABL
  * @author Dave Syer
  *
  */
-@Endpoint(id = "restart", defaultEnablement = DISABLED)
+@Endpoint(id = "restart", enableByDefault = false)
 public class RestartEndpoint
 		implements ApplicationListener<ApplicationPreparedEvent> {
 
@@ -124,7 +122,7 @@ public class RestartEndpoint
 	}
 
 	@Endpoint(id = "resume")
-	@ConfigurationProperties("endpoints.resume")
+	@ConfigurationProperties("management.endpoint.resume")
 	public class ResumeEndpoint {
 
 		@WriteOperation

spring-cloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -6,31 +6,31 @@
     "defaultValue": true
   },
   {
-    "name": "endpoints.env.post.enabled",
+    "name": "management.endpoint.env.post.enabled",
     "type": "java.lang.Boolean",
     "description": "Enable changing the Environment through a POST to /env.",
     "defaultValue": true
   },
   {
-    "name": "endpoints.refresh.enabled",
+    "name": "management.endpoint.refresh.enabled",
     "type": "java.lang.Boolean",
     "description": "Enable the /refresh endpoint to refresh configuration and re-initialize refresh scoped beans.",
     "defaultValue": true
   },
   {
-    "name": "endpoints.restart.enabled",
+    "name": "management.endpoint.restart.enabled",
     "type": "java.lang.Boolean",
     "description": "Enable the /restart endpoint to restart the application context.",
     "defaultValue": true
   },
   {
-    "name": "endpoints.pause.enabled",
+    "name": "management.endpoint.pause.enabled",
     "type": "java.lang.Boolean",
     "description": "Enable the /pause endpoint (to send Lifecycle.stop()).",
     "defaultValue": true
   },
   {
-    "name": "endpoints.resume.enabled",
+    "name": "management.endpoint.resume.enabled",
     "type": "java.lang.Boolean",
     "description": "Enable the /resume endpoint (to send Lifecycle.start()).",
     "defaultValue": true

spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java

@@ -27,96 +27,96 @@ public class LifecycleMvcAutoConfigurationTests {
 	@Test
 	public void environmentWebEndpointExtensionDisabled() {
 		beanNotCreated("environmentWebEndpointExtension",
-				"endpoints.env.enabled=false");
+				"management.endpoint.env.enabled=false");
 	}
 
 	@Test
 	public void environmentWebEndpointExtensionGloballyDisabled() {
 		beanNotCreated("environmentWebEndpointExtension",
-				"endpoints.default.enabled=false");
+				"management.endpoints.enabled-by-default=false");
 	}
 
 	@Test
 	public void environmentWebEndpointExtensionEnabled() {
 		beanCreated("environmentWebEndpointExtension",
-				"endpoints.env.enabled=true");
+				"management.endpoint.env.enabled=true");
 	}
 
 	// restartEndpoint
 	@Test
 	public void restartEndpointDisabled() {
 		beanNotCreated("restartEndpoint",
-				"endpoints.restart.enabled=false");
+				"management.endpoint.restart.enabled=false");
 	}
 
 	@Test
 	public void restartEndpointGloballyDisabled() {
 		beanNotCreated("restartEndpoint",
-				"endpoints.default.enabled=false");
+				"management.endpoint.default.enabled=false");
 	}
 
 	@Test
 	public void restartEndpointEnabled() {
 		beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class,
 				RestartEndpoint::restart,
-				"endpoints.restart.enabled=true");
+				"management.endpoint.restart.enabled=true");
 	}
 
 	// pauseEndpoint
 	@Test
 	public void pauseEndpointDisabled() {
 		beanNotCreated("pauseEndpoint",
-				"endpoints.pause.enabled=false");
+				"management.endpoint.pause.enabled=false");
 	}
 
 	@Test
 	public void pauseEndpointRestartDisabled() {
 		beanNotCreated("pauseEndpoint",
-				"endpoints.restart.enabled=false",
-				"endpoints.pause.enabled=true");
+				"management.endpoint.restart.enabled=false",
+				"management.endpoint.pause.enabled=true");
 	}
 
 	@Test
 	public void pauseEndpointGloballyDisabled() {
 		beanNotCreated("pauseEndpoint",
-				"endpoints.default.enabled=false");
+				"management.endpoint.default.enabled=false");
 	}
 
 	@Test
 	public void pauseEndpointEnabled() {
 		beanCreatedAndEndpointEnabled("pauseEndpoint", RestartEndpoint.PauseEndpoint.class,
 				RestartEndpoint.PauseEndpoint::pause,
-				"endpoints.restart.enabled=true",
-				"endpoints.pause.enabled=true");
+				"management.endpoint.restart.enabled=true",
+				"management.endpoint.pause.enabled=true");
 	}
 
 	// resumeEndpoint
 	@Test
 	public void resumeEndpointDisabled() {
 		beanNotCreated("resumeEndpoint",
-				"endpoints.restart.enabled=true",
-				"endpoints.resume.enabled=false");
+				"management.endpoint.restart.enabled=true",
+				"management.endpoint.resume.enabled=false");
 	}
 
 	@Test
 	public void resumeEndpointRestartDisabled() {
 		beanNotCreated("resumeEndpoint",
-				"endpoints.restart.enabled=false",
-				"endpoints.resume.enabled=true");
+				"management.endpoint.restart.enabled=false",
+				"management.endpoint.resume.enabled=true");
 	}
 
 	@Test
 	public void resumeEndpointGloballyDisabled() {
 		beanNotCreated("resumeEndpoint",
-				"endpoints.default.enabled=false");
+				"management.endpoint.default.enabled=false");
 	}
 
 	@Test
 	public void resumeEndpointEnabled() {
 		beanCreatedAndEndpointEnabled("resumeEndpoint", RestartEndpoint.ResumeEndpoint.class,
 				RestartEndpoint.ResumeEndpoint::resume,
-				"endpoints.restart.enabled=true",
-				"endpoints.resume.enabled=true");
+				"management.endpoint.restart.enabled=true",
+				"management.endpoint.resume.enabled=true");
 	}
 
 	private void beanNotCreated(String beanName, String... contextProperties) {

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java

@@ -59,7 +59,7 @@ public class EnvironmentDecryptApplicationInitializerTests {
 	public void relaxedBinding() {
 		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext();
 		TestPropertyValues.of("FOO_TEXT: {cipher}bar").applyTo(context.getEnvironment(),
-				TestPropertyValues.Type.SYSTEM);
+				TestPropertyValues.Type.SYSTEM_ENVIRONMENT);
 		this.listener.initialize(context);
 		assertEquals("bar", context.getEnvironment().getProperty("foo.text"));
 	}

spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java

@@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestConfiguration.class, properties = "endpoints.default.web.enabled=true")
+@SpringBootTest(classes = TestConfiguration.class, properties = "management.endpoints.web.expose=*")
 public class EnvironmentManagerIntegrationTests {
 
 	@Autowired

spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java

@@ -41,7 +41,7 @@ public class RestartIntegrationTests {
 	@Test
 	public void testRestartTwice() throws Exception {
 
-		context = SpringApplication.run(TestConfiguration.class, "--endpoints.restart.enabled=true", "--server.port=0");
+		context = SpringApplication.run(TestConfiguration.class, "--management.endpoint.restart.enabled=true", "--server.port=0");
 		RestartEndpoint endpoint = context.getBean(RestartEndpoint.class);
 		assertNotNull(context.getParent());
 		assertNull(context.getParent().getParent());

spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java

@@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  *
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = ClientApp.class, properties = "endpoints.default.web.enabled=true", webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = ClientApp.class, properties = "management.endpoints.web.expose=*", webEnvironment = RANDOM_PORT)
 public class RefreshEndpointIntegrationTests {
 
 	@LocalServerPort