Merge branch '1.5.x'

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@@ -628,4 +628,5 @@ public class PropertiesLauncher extends Launcher {
 		}
 
 	}
+
 }

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java

@@ -65,7 +65,8 @@ public class ExplodedArchive implements Archive {
 	 * Create a new {@link ExplodedArchive} instance.
 	 * @param root the root folder
 	 * @param recursive if recursive searching should be used to locate the manifest.
-	 * Defaults to {@code true}, folders with a large tree might want to set this to {@code
+	 * Defaults to {@code true}, folders with a large tree might want to set this to
+	 * {@code
 	 * false}.
 	 */
 	public ExplodedArchive(File root, boolean recursive) {

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@@ -404,7 +404,9 @@ public class JarFile extends java.util.jar.JarFile {
 	 * The type of a {@link JarFile}.
 	 */
 	enum JarFileType {
+
 		DIRECT, NESTED_DIRECTORY, NESTED_JAR
+
 	}
 
 }

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java

@@ -32,7 +32,6 @@ import java.util.Set;
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Dave Syer
- *
  * @see System#getProperty(String)
  */
 public abstract class SystemPropertyUtils {

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

@@ -122,6 +122,7 @@ class InternalOutputCapture implements TestRule {
 			this.copy.flush();
 			this.original.flush();
 		}
+
 	}
 
 }

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

@@ -253,6 +253,7 @@ public class PropertiesLauncherTests {
 		protected Class<?> findClass(String name) throws ClassNotFoundException {
 			return super.findClass(name);
 		}
+
 	}
 
 }

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

@@ -60,4 +60,5 @@ public class WarLauncherTests extends AbstractExecutableArchiveLauncherTests {
 				new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/classes!/"),
 				new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/lib/foo.jar!/"));
 	}
+
 }