diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java index 68fe70ff..ba31a1fa 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java @@ -28,7 +28,5 @@ public class SpringDocsModulePlugin extends AbstractSpringModulePlugin { @Override protected void additionalPlugins(Project project) { - PluginManager pluginManager = project.getPluginManager(); - pluginManager.apply(AsciidoctorConventionsPlugin.class); } } diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/MavenPublishingConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/MavenPublishingConventionsPlugin.java index 6550787c..0743bf98 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/MavenPublishingConventionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/MavenPublishingConventionsPlugin.java @@ -126,8 +126,11 @@ public class MavenPublishingConventionsPlugin implements Plugin { private void suppressMavenOptionalFeatureWarnings(MavenPublication publication) { publication.suppressPomMetadataWarningsFor("mavenOptionalApiElements"); publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElements"); + publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElementsClasses"); + publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElementsResources"); } + private void customizeOrganization(MavenPomOrganization organization) { organization.getName().set("Pivotal Software, Inc."); organization.getUrl().set("https://spring.io"); diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishAllJavaComponentsPlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishAllJavaComponentsPlugin.java index 071d561f..aca827b9 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishAllJavaComponentsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishAllJavaComponentsPlugin.java @@ -1,10 +1,13 @@ package org.springframework.pulsar.gradle.publish; +import java.util.stream.Collectors; + import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.plugins.JavaPlatformPlugin; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.publish.PublishingExtension; +import org.gradle.api.publish.maven.MavenArtifactSet; import org.gradle.api.publish.maven.MavenPublication; import org.gradle.api.publish.maven.plugins.MavenPublishPlugin; @@ -17,6 +20,8 @@ public class PublishAllJavaComponentsPlugin implements Plugin { publishing.getPublications().create("mavenJava", MavenPublication.class, maven -> { project.getPlugins().withType(JavaPlugin.class, (plugin) -> { maven.from(project.getComponents().getByName("java")); + // Workaround issue where build/classes and build/resources are attempting to be signed + maven.setArtifacts(maven.getArtifacts().stream().filter((ma) -> ma.getFile().isFile()).collect(Collectors.toSet())); }); project.getPlugins().withType(JavaPlatformPlugin.class, (plugin) -> { maven.from(project.getComponents().getByName("javaPlatform")); diff --git a/spring-pulsar-docs/spring-pulsar-docs.gradle b/spring-pulsar-docs/spring-pulsar-docs.gradle index c22b062e..78a30922 100644 --- a/spring-pulsar-docs/spring-pulsar-docs.gradle +++ b/spring-pulsar-docs/spring-pulsar-docs.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.pulsar.spring-module' + id 'org.springframework.pulsar.spring-docs-module' id 'org.antora' version '1.0.0' id 'io.spring.antora.generate-antora-yml' version '0.0.1' }