Merge branch '1.5.x'

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

@@ -39,7 +39,6 @@ public final class BuildPropertiesWriter {
 	/**
 	 * Creates a new {@code BuildPropertiesWriter} that will write to the given
 	 * {@code outputFile}.
-	 *
 	 * @param outputFile the output file
 	 */
 	public BuildPropertiesWriter(File outputFile) {
@@ -168,4 +167,5 @@ public final class BuildPropertiesWriter {
 		}
 
 	}
+
 }

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

@@ -89,4 +89,5 @@ public abstract class FileUtils {
 		}
 		return hex.toString();
 	}
+
 }

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

@@ -356,6 +356,7 @@ public class JarWriter implements LoaderClassesWriter {
 		public boolean hasZipHeader() {
 			return Arrays.equals(this.header, ZIP_HEADER);
 		}
+
 	}
 
 	/**
@@ -396,6 +397,7 @@ public class JarWriter implements LoaderClassesWriter {
 			entry.setCrc(this.crc.getValue());
 			entry.setMethod(ZipEntry.STORED);
 		}
+
 	}
 
 	/**

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

@@ -39,10 +39,13 @@ public abstract class LogbackInitializer {
 	}
 
 	private static class Initializer {
+
 		public void setRootLogLevel() {
 			ILoggerFactory factory = StaticLoggerBinder.getSingleton().getLoggerFactory();
 			Logger logger = factory.getLogger(Logger.ROOT_LOGGER_NAME);
 			((ch.qos.logback.classic.Logger) logger).setLevel(Level.INFO);
 		}
+
 	}
+
 }

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

@@ -392,7 +392,6 @@ public abstract class MainClassFinder {
 		 * Creates a new {@code MainClass} rather represents the main class with the given
 		 * {@code name}. The class is annotated with the annotations with the given
 		 * {@code annotationNames}.
-		 *
 		 * @param name the name of the class
 		 * @param annotationNames the names of the annotations on the class
 		 */

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

@@ -60,6 +60,7 @@ public class RepackagerTests {
 	};
 
 	private static final long JAN_1_1980;
+
 	private static final long JAN_1_1985;
 
 	static {