From 9aee15ce6a52b5bcdf184166193502950d269eb4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 5 Apr 2016 17:00:41 +0200
Subject: [PATCH] Upgrade to Gradle 2.12

---
 .gitattributes                                |   1 +
 .../gradle/gradle/wrapper/gradle-wrapper.jar  | Bin 53638 -> 53639 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../src/main/resources/project/gradle/gradlew |   4 ++--
 .../main/resources/project/gradle/gradlew.bat |   2 +-
 .../resources/templates/starter-build.gradle  |   2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..c401f19a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.bat    text eol=crlf
\ No newline at end of file
diff --git a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.jar
index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..2c6137b87896c8f70315ae454e00a969ef5f6019 100644
GIT binary patch
delta 2525
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

delta 2493
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

diff --git a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
index 72123f55..d8ecefbc 100644
--- a/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/initializr/src/main/resources/project/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/initializr/src/main/resources/project/gradle/gradlew b/initializr/src/main/resources/project/gradle/gradlew
index 97fac783..9d82f789 100755
--- a/initializr/src/main/resources/project/gradle/gradlew
+++ b/initializr/src/main/resources/project/gradle/gradlew
@@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
diff --git a/initializr/src/main/resources/project/gradle/gradlew.bat b/initializr/src/main/resources/project/gradle/gradlew.bat
index 8a0b282a..5f192121 100644
--- a/initializr/src/main/resources/project/gradle/gradlew.bat
+++ b/initializr/src/main/resources/project/gradle/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/initializr/src/main/resources/templates/starter-build.gradle b/initializr/src/main/resources/templates/starter-build.gradle
index d87409da..4cd12417 100644
--- a/initializr/src/main/resources/templates/starter-build.gradle
+++ b/initializr/src/main/resources/templates/starter-build.gradle
@@ -64,5 +64,5 @@ eclipse {
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '2.9'
+	gradleVersion = '2.12'
 }