From bee8398ea81b99cd1be64ac09fdea2b5b52aca64 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 18 Mar 2025 13:04:42 +0000 Subject: [PATCH] Disable generation of Gradle module metadata so it is not published Closes gh-1504 --- .../conventions/MavenPublishPluginConventions.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/MavenPublishPluginConventions.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/MavenPublishPluginConventions.java index e49b39e3..719da65d 100644 --- a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/MavenPublishPluginConventions.java +++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/MavenPublishPluginConventions.java @@ -22,6 +22,7 @@ import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.publish.PublishingExtension; import org.gradle.api.publish.maven.MavenPublication; import org.gradle.api.publish.maven.plugins.MavenPublishPlugin; +import org.gradle.api.publish.tasks.GenerateModuleMetadata; /** * Conventions for the {@link MavenPublishPlugin}. @@ -41,13 +42,13 @@ class MavenPublishPluginConventions { (variantStrategy) -> variantStrategy.fromResolutionOf("runtimeClasspath")); strategy.usage("java-runtime", (variantStrategy) -> variantStrategy.fromResolutionResult()); }); - configurePom(project, publication); + configure(project, publication); }); }); project.getPlugins().withType(JavaPlatformPlugin.class).all((javaPlatformPlugin) -> { publishing.getPublications().create("maven", MavenPublication.class, (publication) -> { publication.from(project.getComponents().getByName("javaPlatform")); - configurePom(project, publication); + configure(project, publication); }); }); } @@ -62,6 +63,11 @@ class MavenPublishPluginConventions { } } + void configure(Project project, MavenPublication mavenPublication) { + configurePom(project, mavenPublication); + project.getTasks().withType(GenerateModuleMetadata.class, (generate) -> generate.setEnabled(false)); + } + void configurePom(Project project, MavenPublication mavenPublication) { String organizationName = "Broadcom Inc."; String organizationUrl = "https://www.spring.io";