diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 24e804d96a..99654055bd 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -74,7 +74,7 @@
2.4.0
8.2.0
3.0.0
- 1.12
+ 2.9
2.4.7
2.7
1.4.193
diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index 9dc89349c7..f714ff8784 100644
--- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -39,8 +39,8 @@ diverge from the defaults.
By default, Spring Boot {spring-boot-version} requires http://www.java.com[Java 7] and
Spring Framework {spring-version} or above. You can use Spring Boot with Java 6 with some
additional configuration. See <> for more details. Explicit
-build support is provided for Maven (3.2+) and Gradle (1.12 or 2.x). Support for Gradle
-2.8 and earlier is deprecated. Gradle 3 is not supported.
+build support is provided for Maven (3.2+) and Gradle 2 (2.9 or later). Gradle 3 is not
+supported.
TIP: Although you can use Spring Boot with Java 6 or 7, we generally recommend Java 8 if
at all possible.
@@ -205,9 +205,9 @@ scope.
[[getting-started-gradle-installation]]
==== Gradle installation
-Spring Boot is compatible with Gradle 1.12 or 2.x but support for 2.8 and earlier is
-deprecated. Gradle 2.14.1 is recommended. Gradle 3 is not supported. If you don't already
-have Gradle installed you can follow the instructions at http://www.gradle.org/.
+Spring Boot is compatible with Gradle 2 (2.9 or later). Gradle 2.14.1 is recommended and
+Gradle 3 is not supported. 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/BootRunResourceTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java
index 29c1894870..68c701f4af 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/BootRunResourceTests.java
@@ -50,7 +50,7 @@ public class BootRunResourceTests {
public void resourcesDirectlyFromSource() {
project.newBuild().forTasks("clean", "bootRun")
.withArguments("-PbootVersion=" + BOOT_VERSION, "-PaddResources=true")
- .run();
+ .setStandardOutput(System.out).run();
assertThat(this.output.toString()).contains("src/main/resources/test.txt");
}
@@ -59,7 +59,7 @@ public class BootRunResourceTests {
public void resourcesFromBuildOutput() {
project.newBuild().forTasks("clean", "bootRun")
.withArguments("-PbootVersion=" + BOOT_VERSION, "-PaddResources=false")
- .run();
+ .setStandardOutput(System.out).run();
assertThat(this.output.toString()).contains("build/resources/main/test.txt");
}
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 8bd63b9c78..0fade89196 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("1.12");
+ this("2.9");
}
public ProjectCreator(String gradleVersion) {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
index 92e4dd9d27..18551e99f0 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
@@ -9,6 +9,7 @@ buildscript {
}
}
+apply plugin: 'application'
apply plugin: 'java'
apply plugin: 'org.springframework.boot'
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 6a056f412e..e6a114a30a 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -187,11 +187,6 @@
aether-util
${aether.version}
-
- org.gradle
- gradle-core
- ${gradle.version}
-
org.gradle
gradle-base-services
@@ -202,6 +197,26 @@
gradle-base-services-groovy
${gradle.version}
+
+ org.gradle
+ gradle-core
+ ${gradle.version}
+
+
+ org.gradle
+ gradle-language-java
+ ${gradle.version}
+
+
+ org.gradle
+ gradle-language-jvm
+ ${gradle.version}
+
+
+ org.gradle
+ gradle-platform-jvm
+ ${gradle.version}
+
org.gradle
gradle-plugins
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 45d32764e6..8d1f6e961e 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -33,6 +33,11 @@
groovy
provided
+
+ org.gradle
+ gradle-base-services
+ provided
+
org.gradle
gradle-core
@@ -40,7 +45,17 @@
org.gradle
- gradle-base-services
+ gradle-language-java
+ provided
+
+
+ org.gradle
+ gradle-language-jvm
+ provided
+
+
+ org.gradle
+ gradle-platform-jvm
provided
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
index e6253a0427..3ed0349e42 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
@@ -22,9 +22,6 @@ import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.util.GradleVersion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.boot.gradle.SpringBootPluginExtension;
import org.springframework.boot.gradle.agent.AgentPluginFeatures;
@@ -41,15 +38,8 @@ import org.springframework.boot.gradle.run.RunPluginFeatures;
*/
public class SpringBootPlugin implements Plugin {
- private static final Logger logger = LoggerFactory.getLogger(SpringBootPlugin.class);
-
@Override
public void apply(Project project) {
- if (GradleVersion.current().compareTo(GradleVersion.version("2.9")) < 0) {
- logger.warn("Spring Boot plugin's support for Gradle "
- + GradleVersion.current().getVersion()
- + " is deprecated. Please upgrade to Gradle 2.9 or later.");
- }
project.getExtensions().create("springBoot", SpringBootPluginExtension.class,
project);
project.getPlugins().apply(JavaPlugin.class);
@@ -67,7 +57,6 @@ public class SpringBootPlugin implements Plugin {
compile.doFirst(new Action() {
@Override
- @SuppressWarnings("deprecation")
public void execute(Task t) {
if (compile.getOptions().getEncoding() == null) {
compile.getOptions().setEncoding("UTF-8");