Merge branch '1.5.x'

2016-12-21 22:32:43 -08:00
parent ae389d27a6 78ee8637bc
commit 6e02fe59f7
33 changed files with 540 additions and 130 deletions
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
@@ -372,7 +372,7 @@ public abstract class MainClassFinder {

 		/**
 		 * Handle the specified main class.
-		 * @param mainClass the mainClass
+		 * @param mainClass the main class
 		 * @return a non-null value if processing should end or {@code null} to continue
 		 */
 		T doWith(MainClass mainClass);