[CI] Filter out java-classes-dir and java-resources-dir from published artifacts

This commit is contained in:
Chris Bono
2023-10-05 21:18:40 -05:00
parent a2415e92b3
commit 0a2fd418e1
2 changed files with 22 additions and 6 deletions

View File

@@ -82,6 +82,11 @@ public class MavenPublishingConventionsPlugin implements Plugin<Project> {
}
private void customizeMavenPublication(MavenPublication publication, Project project) {
// Skip the fake 'hiddenMavenJava' publication otherwise when the actual 'mavenJava' publication
// comes back through here it will fail w/ an attempt to modify an immutable configuration.
if (publication.getName() == "hiddenMavenJava") {
return;
}
customizePom(publication.getPom(), project);
project.getPlugins().withType(JavaPlugin.class)
.all((javaPlugin) -> customizeJavaMavenPublication(publication, project));
@@ -126,8 +131,6 @@ public class MavenPublishingConventionsPlugin implements Plugin<Project> {
private void suppressMavenOptionalFeatureWarnings(MavenPublication publication) {
publication.suppressPomMetadataWarningsFor("mavenOptionalApiElements");
publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElements");
publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElementsClasses");
publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElementsResources");
}

View File

@@ -1,5 +1,6 @@
package org.springframework.pulsar.gradle.publish;
import java.util.LinkedHashSet;
import java.util.stream.Collectors;
import org.gradle.api.Plugin;
@@ -7,7 +8,6 @@ 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,11 +17,24 @@ public class PublishAllJavaComponentsPlugin implements Plugin<Project> {
public void apply(Project project) {
project.getPlugins().withType(MavenPublishPlugin.class).all((mavenPublish) -> {
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
publishing.getPublications().create("mavenJava", MavenPublication.class, maven -> {
// To get around some weirdness w/ the Signing plugin attempting to use java-classes-dir and java-resources-dir
// as artifacts to sign, we load the artifacts into a hidden dummy MavenPublication using from(components.java)
// and then filter out the unwanted artifacts. Finally, we add those to the actual mavenJava artifact.
// NOTE: If MavenPublication.setArtifacts is called after MavenPublication.from then downstream issues will
// occur when building due to artifacts modified exceptions.
var filteredMainArtifacts = new LinkedHashSet<>();
var hiddenMavenJavaPub = publishing.getPublications().create("hiddenMavenJava", 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()));
filteredMainArtifacts.addAll(maven.getArtifacts().stream().filter((ma) -> ma.getFile().isFile()).collect(Collectors.toSet()));
});
});
publishing.getPublications().remove(hiddenMavenJavaPub);
publishing.getPublications().create("mavenJava", MavenPublication.class, maven -> {
project.getPlugins().withType(JavaPlugin.class, (plugin) -> {
filteredMainArtifacts.forEach((ma) -> maven.artifact(ma));
});
project.getPlugins().withType(JavaPlatformPlugin.class, (plugin) -> {
maven.from(project.getComponents().getByName("javaPlatform"));