From ba1d4ab458c6d3534840b92fcf784eafb53fe40a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 9 Apr 2020 13:05:05 +0100
Subject: [PATCH] Polish "Split ConventionsPlugin into separate, more focussed
 classes"

See gh-20805
---
 .../boot/build/ConventionsPlugin.java          | 18 +++---------------
 .../boot/build/JavaConventions.java            |  9 ++-------
 .../boot/build/MavenPublishingConventions.java | 10 +++++-----
 3 files changed, 10 insertions(+), 27 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 4ecb18f016c..3454a2efa51 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -26,8 +26,8 @@ import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
  * Plugin to apply conventions to projects that are part of Spring Boot's build.
  * Conventions are applied in response to various plugins being applied.
  *
- * When the {@link JavaBasePlugin} is applied, the conventions in *
- * {@link JavaConventions} are applied.
+ * When the {@link JavaBasePlugin} is applied, the conventions in {@link JavaConventions}
+ * are applied.
  *
  * When the {@link MavenPublishPlugin} is applied, the conventions in
  * {@link MavenPublishingConventions} are applied.
@@ -43,21 +43,9 @@ public class ConventionsPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-		applyJavaConventions(project);
-		applyMavenPublishingConventions(project);
-		applyAsciidoctorConventions(project);
-	}
-
-	private void applyJavaConventions(Project project) {
 		new JavaConventions().apply(project);
-	}
-
-	private void applyAsciidoctorConventions(Project project) {
+		new MavenPublishingConventions().apply(project);
 		new AsciidoctorConventions().apply(project);
 	}
 
-	private void applyMavenPublishingConventions(Project project) {
-		new MavenPublishingConventions().applyPublishingConventions(project);
-	}
-
 }
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
index e423cdd6125..c92a20ba45a 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -48,13 +48,8 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
 import org.springframework.util.FileCopyUtils;
 
 /**
- * Applies Java Plugin conventions to projects that are part of Spring Boot's build.
- * Conventions are applied in response to various plugins being applied.
- * <p/>
- *
- * When the {@link JavaBasePlugin Java base plugin} is applied:
- *
- * <p/>
+ * Conventions that are applied in the presence of the {@link JavaBasePlugin}. When the
+ * plugin is applied:
  *
  * <ul>
  * <li>{@code sourceCompatibility} is set to {@code 1.8}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
index 837d048c40d..91d0b27dac1 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
@@ -31,10 +31,8 @@ import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
 /**
- * Applies Maven Publishing conventions to projects that are part of Spring Boot's build.
- * Conventions are applied in response to various plugins being applied.
- *
- * When the {@link MavenPublishPlugin Maven Publish plugin} is applied:
+ * Conventions that are applied in the presence of the {@link MavenPublishPlugin}. When
+ * the plugin is applied:
  *
  * <ul>
  * <li>If the {@code deploymentRepository} property has been set, a
@@ -42,6 +40,8 @@ import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
  * it.
  * <li>The poms of all {@link MavenPublication Maven publications} are customized to meet
  * Maven Central's requirements.
+ * <li>If the {@link JavaPlugin Java plugin} has also been applied, creation of Javadoc
+ * and source jars is enabled.
  * </ul>
  *
  * <p/>
@@ -52,7 +52,7 @@ import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
  */
 class MavenPublishingConventions {
 
-	void applyPublishingConventions(Project project) {
+	void apply(Project project) {
 		project.getPlugins().withType(MavenPublishPlugin.class).all((mavenPublish) -> {
 			PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
 			if (project.hasProperty("deploymentRepository")) {