From 468eca91e928fa18796138c84fbb921513951b7a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 19 Jan 2020 20:02:13 +0000
Subject: [PATCH] Apply Java conventions to projects that only apply Java base
 plugin

Fixes gh-19806
---
 .../org/springframework/boot/build/ConventionsPlugin.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
index be27bc4dd7d..0485802d8c9 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -26,6 +26,7 @@ import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.plugins.quality.CheckstyleExtension;
@@ -53,7 +54,7 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
  *
  * <p/>
  *
- * When the {@link JavaPlugin Java plugin} is applied:
+ * When the {@link JavaBasePlugin Java base plugin} is applied:
  *
  * <ul>
  * <li>{@code sourceCompatibility} is set to {@code 1.8}
@@ -106,7 +107,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 	}
 
 	private void applyJavaConventions(Project project) {
-		project.getPlugins().withType(JavaPlugin.class, (java) -> {
+		project.getPlugins().withType(JavaBasePlugin.class, (java) -> {
 			project.getPlugins().apply(TestFailuresPlugin.class);
 			configureSpringJavaFormat(project);
 			project.setProperty("sourceCompatibility", "1.8");