Merge branch '1.2.x'

spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java

@@ -101,7 +101,7 @@ public class ExplodedArchiveTests {
 	@Test
 	public void getEntries() throws Exception {
 		Map<String, Archive.Entry> entries = getEntriesMap(this.archive);
-		assertThat(entries.size(), equalTo(9));
+		assertThat(entries.size(), equalTo(10));
 	}
 
 	@Test

spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java

@@ -91,6 +91,7 @@ public class JarFileTests {
 		assertThat(entries.nextElement().getName(), equalTo("special/"));
 		assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat"));
 		assertThat(entries.nextElement().getName(), equalTo("nested.jar"));
+		assertThat(entries.nextElement().getName(), equalTo("another-nested.jar"));
 		assertThat(entries.hasMoreElements(), equalTo(false));
 		URL jarUrl = new URL("jar:" + this.rootJarFile.toURI() + "!/");
 		URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { jarUrl });
@@ -132,6 +133,7 @@ public class JarFileTests {
 		assertThat(entries.nextElement().getName(), equalTo("special/"));
 		assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat"));
 		assertThat(entries.nextElement().getName(), equalTo("nested.jar"));
+		assertThat(entries.nextElement().getName(), equalTo("another-nested.jar"));
 		assertThat(entries.hasMoreElements(), equalTo(false));
 	}