Merge branch '1.2.x'

2015-10-09 13:39:09 -07:00
parent 3cabca7db4 94736719f1
commit 04074fece1
104 changed files with 38 additions and 120 deletions
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/jar/package-info.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/jar/package-info.java
@@ -19,4 +19,3 @@
 * @see org.springframework.boot.cli.command.jar.JarCommand
 */
 package org.springframework.boot.cli.jar;
-
--- a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/package-info.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/package-info.java
@@ -20,4 +20,3 @@
 * we want to extract into a separate jar at a future date.
 */
 package org.springframework.boot.groovy;
-