From b35c162593e26aa7f71a43ce598e63a30ba47695 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 11 Mar 2017 09:03:06 +0000
Subject: [PATCH] Raise the minimum supported version of Gradle to 3.4

Closes gh-7922
---
 spring-boot-dependencies/pom.xml                            | 2 +-
 spring-boot-docs/src/main/asciidoc/getting-started.adoc     | 6 +++---
 .../java/org/springframework/boot/gradle/InstallTests.java  | 6 ++----
 .../org/springframework/boot/gradle/ProjectCreator.java     | 2 +-
 spring-boot-parent/pom.xml                                  | 5 +++++
 spring-boot-tools/spring-boot-gradle-plugin/pom.xml         | 5 +++++
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 51bacee08d..43087ae13c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -78,7 +78,7 @@
 		<freemarker.version>2.3.25-incubating</freemarker.version>
 		<elasticsearch.version>2.4.4</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
-		<gradle.version>2.9</gradle.version>
+		<gradle.version>3.4</gradle.version>
 		<groovy.version>2.4.9</groovy.version>
 		<gson.version>2.8.0</gson.version>
 		<h2.version>1.4.193</h2.version>
diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index e69b1a1475..9fe7badf5e 100644
--- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -38,7 +38,7 @@ diverge from the defaults.
 == System Requirements
 Spring Boot {spring-boot-version} requires http://www.java.com[Java 8] and Spring
 Framework {spring-version} or above. Explicit build support is provided for Maven
-(3.2+), and Gradle 2 (2.9 or later) and 3.
+(3.2+), and Gradle 3 (3.4 or later).
 
 
 [[getting-started-system-requirements-servlet-containers]]
@@ -184,8 +184,8 @@ scope.
 
 [[getting-started-gradle-installation]]
 ==== Gradle installation
-Spring Boot is compatible with Gradle 2 (2.9 or later) and Gradle 3. If you don't already
-have Gradle installed you can follow the instructions at http://www.gradle.org/.
+Spring Boot is compatible with Gradle 3 (3.4 or later). If you don't already have Gradle
+installed you can follow the instructions at http://www.gradle.org/.
 
 Spring Boot dependencies can be declared using the `org.springframework.boot` `group`.
 Typically your project will declare dependencies to one or more
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
index 1725c955a0..a787570b23 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
@@ -38,11 +38,9 @@ public class InstallTests {
 	}
 
 	@Test
-	public void cleanInstallApp() throws Exception {
+	public void cleanInstallDist() throws Exception {
 		this.project = new ProjectCreator().createProject("install-app");
-		// "install" from the application plugin was renamed "installApp" in Gradle
-		// 1.0
-		this.project.newBuild().forTasks("installApp")
+		this.project.newBuild().forTasks("installDist")
 				.withArguments("-PbootVersion=" + BOOT_VERSION, "--stacktrace").run();
 	}
 
diff --git 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
index 0fade89196..3b6038f37a 100644
--- 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
@@ -34,7 +34,7 @@ public class ProjectCreator {
 	private String gradleVersion;
 
 	public ProjectCreator() {
-		this("2.9");
+		this("3.4");
 	}
 
 	public ProjectCreator(String gradleVersion) {
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index db9c9114bb..2d559cdbe9 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -234,6 +234,11 @@
 				<artifactId>gradle-plugins</artifactId>
 				<version>${gradle.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.gradle</groupId>
+				<artifactId>gradle-process-services</artifactId>
+				<version>${gradle.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-runtime</artifactId>
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 8d1f6e961e..b9134a3c44 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -63,6 +63,11 @@
 			<artifactId>gradle-plugins</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gradle</groupId>
+			<artifactId>gradle-process-services</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>