Commit b35c1625 authored by Andy Wilkinson's avatar Andy Wilkinson

Raise the minimum supported version of Gradle to 3.4

Closes gh-7922
parent b1f679b1
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<freemarker.version>2.3.25-incubating</freemarker.version> <freemarker.version>2.3.25-incubating</freemarker.version>
<elasticsearch.version>2.4.4</elasticsearch.version> <elasticsearch.version>2.4.4</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.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> <groovy.version>2.4.9</groovy.version>
<gson.version>2.8.0</gson.version> <gson.version>2.8.0</gson.version>
<h2.version>1.4.193</h2.version> <h2.version>1.4.193</h2.version>
......
...@@ -38,7 +38,7 @@ diverge from the defaults. ...@@ -38,7 +38,7 @@ diverge from the defaults.
== System Requirements == System Requirements
Spring Boot {spring-boot-version} requires http://www.java.com[Java 8] and Spring 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 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]] [[getting-started-system-requirements-servlet-containers]]
...@@ -184,8 +184,8 @@ scope. ...@@ -184,8 +184,8 @@ scope.
[[getting-started-gradle-installation]] [[getting-started-gradle-installation]]
==== Gradle installation ==== Gradle installation
Spring Boot is compatible with Gradle 2 (2.9 or later) and Gradle 3. If you don't already Spring Boot is compatible with Gradle 3 (3.4 or later). If you don't already have Gradle
have Gradle installed you can follow the instructions at http://www.gradle.org/. installed you can follow the instructions at http://www.gradle.org/.
Spring Boot dependencies can be declared using the `org.springframework.boot` `group`. Spring Boot dependencies can be declared using the `org.springframework.boot` `group`.
Typically your project will declare dependencies to one or more Typically your project will declare dependencies to one or more
......
...@@ -38,11 +38,9 @@ public class InstallTests { ...@@ -38,11 +38,9 @@ public class InstallTests {
} }
@Test @Test
public void cleanInstallApp() throws Exception { public void cleanInstallDist() throws Exception {
this.project = new ProjectCreator().createProject("install-app"); this.project = new ProjectCreator().createProject("install-app");
// "install" from the application plugin was renamed "installApp" in Gradle this.project.newBuild().forTasks("installDist")
// 1.0
this.project.newBuild().forTasks("installApp")
.withArguments("-PbootVersion=" + BOOT_VERSION, "--stacktrace").run(); .withArguments("-PbootVersion=" + BOOT_VERSION, "--stacktrace").run();
} }
......
...@@ -34,7 +34,7 @@ public class ProjectCreator { ...@@ -34,7 +34,7 @@ public class ProjectCreator {
private String gradleVersion; private String gradleVersion;
public ProjectCreator() { public ProjectCreator() {
this("2.9"); this("3.4");
} }
public ProjectCreator(String gradleVersion) { public ProjectCreator(String gradleVersion) {
......
...@@ -234,6 +234,11 @@ ...@@ -234,6 +234,11 @@
<artifactId>gradle-plugins</artifactId> <artifactId>gradle-plugins</artifactId>
<version>${gradle.version}</version> <version>${gradle.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-process-services</artifactId>
<version>${gradle.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId> <artifactId>kotlin-runtime</artifactId>
......
...@@ -63,6 +63,11 @@ ...@@ -63,6 +63,11 @@
<artifactId>gradle-plugins</artifactId> <artifactId>gradle-plugins</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-process-services</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment