Merge remote-tracking branch 'local12x/1.2.x'

2015-10-19 12:56:55 -07:00
parent 5080e2d71f a79131f8d2
commit 1e4d974ec0
573 changed files with 791 additions and 360 deletions
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import org.gradle.tooling.GradleConnector;
 import org.gradle.tooling.ProjectConnection;
 import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
+
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.FileSystemUtils;