Merge branch '2.0.x'

Author: philwebb

spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java

@@ -80,7 +80,9 @@ public void launchApplication() throws Exception {
 
 	@After
 	public void stopApplication() throws InterruptedException {
-		this.launchedApplication.stop();
+		if (this.launchedApplication != null) {
+			this.launchedApplication.stop();
+		}
 	}
 
 	@Test

spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java

@@ -40,12 +40,12 @@ public LaunchedApplication launchApplication(JvmLauncher javaLauncher)
 			throws Exception {
 		LaunchedJvm applicationJvm = javaLauncher.launch("app",
 				createApplicationClassPath(), "com.example.DevToolsTestApplication",
-				"--server.port=12345", "--spring.devtools.remote.secret=secret");
-		awaitServerPort(applicationJvm.getStandardOut());
+				"--server.port=0", "--spring.devtools.remote.secret=secret");
+		int port = awaitServerPort(applicationJvm.getStandardOut());
 		LaunchedJvm remoteSpringApplicationJvm = javaLauncher.launch(
 				"remote-spring-application", createRemoteSpringApplicationClassPath(),
 				RemoteSpringApplication.class.getName(),
-				"--spring.devtools.remote.secret=secret", "http://localhost:12345");
+				"--spring.devtools.remote.secret=secret", "http://localhost:" + port);
 		awaitRemoteSpringApplication(remoteSpringApplicationJvm.getStandardOut());
 		return new LaunchedApplication(new File("target/remote"),
 				applicationJvm.getStandardOut(), applicationJvm.getStandardError(),