avoid duplicated publication

Author: ndr-brt

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java

@@ -41,12 +41,9 @@ public void apply(Project target) {
         plugins.apply(MavenPublishPlugin.class);
         plugins.apply(JavaPlugin.class);
         plugins.apply(TestSummaryPlugin.class);
-        plugins.apply(com.vanniktech.maven.publish.MavenPublishPlugin.class);
 
         if (target == target.getRootProject()) {
             plugins.apply(ChecksumPlugin.class);
-            // The nexus publish plugin MUST be applied to the root project only, it'll throw an exception otherwise
-            // target.getPlugins().apply(NexusPublishPlugin.class); TODO: here apply the publish plugin
             plugins.apply(OpenApiMergerPlugin.class);
             plugins.apply(ModuleNamesPlugin.class);
         }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java

@@ -19,7 +19,6 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven;
-import org.gradle.api.tasks.TaskCollection;
 import org.gradle.plugins.signing.Sign;
 
 import static java.util.List.of;
@@ -51,12 +50,6 @@ public void apply(Project target) {
         // apply all plugins
         target.getPlugins().apply(EdcBuildBasePlugin.class);
 
-        // add task dependency to permit publication
-        var publish = target.getTasks().findByName("publishMavenJavaPublicationToMavenCentralRepository");
-        if (publish != null) {
-            publish.dependsOn("signMavenPublication");
-        }
-
         target.getTasks().withType(AbstractPublishToMaven.class).configureEach(task -> {
             var signTasks = target.getTasks().withType(Sign.class);
             task.mustRunAfter(signTasks);

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/MavenArtifactConvention.java

@@ -38,12 +38,21 @@
 class MavenArtifactConvention implements EdcConvention {
 
     private static final String PROJECT_URL = "https://projects.eclipse.org/projects/technology.edc";
+    private static final boolean DEFAULT_SHOULD_PUBLISH = true;
 
     @Override
     public void apply(Project target) {
         target.afterEvaluate(project -> {
             var pubExt = requireExtension(project, PublishingExtension.class);
-            var pomExt = requireExtension(project, BuildExtension.class).getPom();
+            var buildExtension = requireExtension(project, BuildExtension.class);
+            var pomExt = buildExtension.getPom();
+
+            var shouldPublish = buildExtension.getPublish().getOrElse(DEFAULT_SHOULD_PUBLISH);
+
+            if (!shouldPublish) {
+                pubExt.getPublications().clear();
+                return;
+            }
 
             pubExt.getPublications().stream()
                     .filter(p -> p instanceof MavenPublication)

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/MavenPublicationConvention.java

@@ -15,57 +15,24 @@
 package org.eclipse.edc.plugins.edcbuild.conventions;
 
 import com.vanniktech.maven.publish.MavenPublishBaseExtension;
-import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
+import com.vanniktech.maven.publish.MavenPublishPlugin;
 import org.gradle.api.Project;
-import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.maven.MavenPublication;
 
-import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;
-
-/**
- * Adds a Maven publication to a project.
- */
 public class MavenPublicationConvention implements EdcConvention {
 
-    /**
-     * Default setting for publication of a project.
-     */
-    private static final boolean DEFAULT_SHOULD_PUBLISH = true;
-
-    /**
-     * Checks whether publishing is explicitly set to false for the target project and, if it is
-     * not, adds a Maven publication to the project, if none exists. This only applies for
-     * sub-projects that contain a build.gradle.kts file.
-     *
-     * @param target The project to which the convention applies
-     */
     @Override
     public void apply(Project target) {
         // do not publish the root project or modules without a build.gradle.kts
         if (target.getRootProject() == target || !target.file("build.gradle.kts").exists()) {
             return;
         }
 
-        var buildExt = requireExtension(target, BuildExtension.class);
-        var shouldPublish = buildExt.getPublish().getOrElse(DEFAULT_SHOULD_PUBLISH);
+        target.getPlugins().apply(MavenPublishPlugin.class);
 
-        if (shouldPublish) {
-            var pe = requireExtension(target, PublishingExtension.class);
+        target.getExtensions().configure(MavenPublishBaseExtension.class, extension -> {
+            extension.publishToMavenCentral(true);
+        });
 
-            if (pe.getPublications().findByName(target.getName()) == null) {
-                pe.publications(publications -> publications.create(target.getName(), MavenPublication.class,
-                        mavenPublication -> {
-                            mavenPublication.from(target.getComponents().getByName("java"));
-                            mavenPublication.setGroupId(buildExt.getPom().getGroupId());
-                            mavenPublication.suppressPomMetadataWarningsFor("testFixturesApiElements");
-                            mavenPublication.suppressPomMetadataWarningsFor("testFixturesRuntimeElements");
-                        }));
-            }
-
-            target.getExtensions().configure(MavenPublishBaseExtension.class, extension -> {
-                extension.publishToMavenCentral(true);
-            });
-        }
     }
 
 }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/extensions/MavenPomExtension.java

@@ -39,10 +39,12 @@ public abstract class MavenPomExtension {
 
     public abstract Property<String> getScmUrl();
 
+    @Deprecated(since = "edc-build-0.1.0")
     public String getGroupId() {
         return groupId;
     }
 
+    @Deprecated(since = "edc-build-0.1.0")
     public void setGroupId(String groupId) {
         this.groupId = groupId;
     }