Merge branch '1.5.x'

Author: wilkinsona

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java

@@ -75,12 +75,10 @@ public void skipsUrls() throws Exception {
 	@Test
 	public void urlsFromJarClassPathAreConsidered() throws Exception {
 		File relative = this.temporaryFolder.newFolder();
-		File absoluteFile = this.temporaryFolder.newFolder();
 		URL absoluteUrl = this.temporaryFolder.newFolder().toURI().toURL();
 		File jarWithClassPath = makeJarFileWithUrlsInManifestClassPath(
 				"project-core/target/classes/", "project-web/target/classes/",
-				"does-not-exist/target/classes", relative.getName() + "/",
-				absoluteFile.getAbsolutePath() + "/", absoluteUrl);
+				"does-not-exist/target/classes", relative.getName() + "/", absoluteUrl);
 		new File(jarWithClassPath.getParentFile(), "project-core/target/classes")
 				.mkdirs();
 		new File(jarWithClassPath.getParentFile(), "project-web/target/classes").mkdirs();
@@ -90,7 +88,7 @@ public void urlsFromJarClassPathAreConsidered() throws Exception {
 		assertThat(urls.toList()).containsExactly(
 				new URL(jarWithClassPath.toURI().toURL(), "project-core/target/classes/"),
 				new URL(jarWithClassPath.toURI().toURL(), "project-web/target/classes/"),
-				relative.toURI().toURL(), absoluteFile.toURI().toURL(), absoluteUrl);
+				relative.toURI().toURL(), absoluteUrl);
 	}
 
 	private URL makeUrl(String name) throws IOException {