Merge branch '1.4.x' into 1.5.x

spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java

@@ -225,6 +225,7 @@ public class CliTester implements TestRule {
 				throw new IllegalStateException(ex);
 			}
 		}
+
 	}
 
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java

@@ -85,4 +85,5 @@ public class GrabCommandIntegrationTests {
 		assertThat(new File("target/repository/javax/ejb/ejb-api/3.0").isDirectory())
 				.isTrue();
 	}
+
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java

@@ -140,6 +140,7 @@ public class SpringApplicationLauncherTests {
 		public void run(String[] args) {
 			TestSpringApplication.args = args;
 		}
+
 	}
 
 	private class TestSpringApplicationLauncher extends SpringApplicationLauncher {

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java

@@ -49,4 +49,5 @@ public class CommandRunnerIntegrationTests {
 		runner.runAndHandleErrors("run", "samples/app.groovy", "--", "-d");
 		assertThat(this.output.toString()).doesNotContain("Negative matches:");
 	}
+
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java

@@ -199,6 +199,9 @@ public class CommandRunnerTests {
 	}
 
 	private enum Call {
+
 		SHOW_USAGE, ERROR_MESSAGE, PRINT_STACK_TRACE
+
 	}
+
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -267,4 +267,5 @@ public class AetherGrapeEngineTests {
 		}
 		return System.clearProperty(key);
 	}
+
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java

@@ -105,6 +105,7 @@ public class GrapeRootRepositorySystemSessionAutoConfigurationTests {
 	}
 
 	private class LocalRepositoryManagerAnswer implements Answer<LocalRepositoryManager> {
+
 		@Override
 		public LocalRepositoryManager answer(InvocationOnMock invocation)
 				throws Throwable {

spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java

@@ -33,7 +33,6 @@ public final class SystemProperties {
 	/**
 	 * Performs the given {@code action} with the given system properties set. System
 	 * properties are restored to their previous values once the action has run.
-	 *
 	 * @param action The action to perform
 	 * @param systemPropertyPairs The system properties, each in the form
 	 * {@code key:value}
@@ -61,4 +60,5 @@ public final class SystemProperties {
 			}
 		}
 	}
+
 }