From 47a68650c906d902a10ead20cc3510e25fed12ea Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 10 Mar 2020 14:13:10 +0000
Subject: [PATCH] Enable generation of Gradle's module metadata

Changes in Gradle 6.2 should address the problems described in
4f75ab5f.

Closes gh-19609
---
 .../org/springframework/boot/build/ConventionsPlugin.java     | 4 ----
 1 file changed, 4 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 633280f0c2..1941228ed4 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -51,7 +51,6 @@ import org.gradle.api.publish.maven.MavenPomOrganization;
 import org.gradle.api.publish.maven.MavenPomScm;
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
-import org.gradle.api.publish.tasks.GenerateModuleMetadata;
 import org.gradle.api.resources.TextResourceFactory;
 import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.api.tasks.compile.JavaCompile;
@@ -100,8 +99,6 @@ import org.springframework.util.FileCopyUtils;
  * Maven Central's requirements.
  * <li>If the {@link JavaPlugin Java plugin} has also been applied, creation of Javadoc
  * and source jars is enabled.
- * <li>Generation of Gradle module metadata is disabled as it is incompatible with our
- * two-step publishing process.</li>
  * </ul>
  *
  * <p/>
@@ -229,7 +226,6 @@ public class ConventionsPlugin implements Plugin<Project> {
 
 	private void applyMavenPublishingConventions(Project project) {
 		project.getPlugins().withType(MavenPublishPlugin.class).all((mavenPublish) -> {
-			project.getTasks().withType(GenerateModuleMetadata.class).all((generate) -> generate.setEnabled(false));
 			PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
 			if (project.hasProperty("deploymentRepository")) {
 				publishing.getRepositories().maven((mavenRepository) -> {