Merge branch '1.5.x'

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

@@ -187,11 +187,11 @@ final class JarURLConnection extends java.net.JarURLConnection {
 
 	@Override
 	public int getContentLength() {
-		long longContentLength = getContentLengthLong();
-		if (longContentLength > Integer.MAX_VALUE) {
+		long length = getContentLengthLong();
+		if (length > Integer.MAX_VALUE) {
 			return -1;
 		}
-		return (int) longContentLength;
+		return (int) length;
 	}
 
 	@Override

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -151,8 +151,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 
 	/**
 	 * Make a fully executable jar for *nix machines by prepending a launch script to the
-	 * jar.
-	 * <br/>
+	 * jar. <br/>
 	 * Currently, some tools do not accept this format so you may not always be able to
 	 * use this technique. For example, <code>jar -xf</code> may silently fail to extract
 	 * a jar or war that has been made fully-executable. It is recommended that you only