From c0517c8bfab1bc15fbc0f3ea27a91735b7021e22 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Thu, 8 Sep 2022 17:36:14 +0100 Subject: [PATCH] Remove gradle metadata publish - Remove broken metadata module files to possibly bring those back when concept is more useful and easier to setup/test. - Fixes #521 --- .../springframework/shell/gradle/ArtifactoryConventions.java | 5 +++++ .../java/org/springframework/shell/gradle/DocsPlugin.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java index d668daf4..15994ddd 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/ArtifactoryConventions.java @@ -21,6 +21,7 @@ import java.util.Map; import org.gradle.api.Project; import org.gradle.api.Task; import org.gradle.api.plugins.PluginManager; +import org.gradle.api.publish.tasks.GenerateModuleMetadata; import org.jfrog.build.extractor.clientConfiguration.ArtifactSpec; import org.jfrog.build.extractor.clientConfiguration.ArtifactSpecs; import org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin; @@ -35,6 +36,10 @@ public class ArtifactoryConventions { PluginManager pluginManager = project.getPluginManager(); pluginManager.apply(ArtifactoryPlugin.class); + project.getTasks().withType(GenerateModuleMetadata.class, metadata -> { + metadata.setEnabled(false); + }); + project.getPlugins().withType(ArtifactoryPlugin.class, artifactory -> { Task task = project.getTasks().findByName(ArtifactoryTask.ARTIFACTORY_PUBLISH_TASK_NAME); if (task != null) { diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.java index 99f78d84..37c742ce 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.java @@ -36,6 +36,7 @@ import org.gradle.api.Project; import org.gradle.api.plugins.JavaLibraryPlugin; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.PluginManager; +import org.gradle.api.publish.tasks.GenerateModuleMetadata; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.dsl.RepositoryHandler; import org.gradle.api.file.CopySpec; @@ -57,6 +58,10 @@ class DocsPlugin implements Plugin { pluginManager.apply(AsciidoctorJPlugin.class); configureAdocPlugins(project); + + project.getTasks().withType(GenerateModuleMetadata.class, metadata -> { + metadata.setEnabled(false); + }); } private void configureAdocPlugins(Project project) {