fix: exclude modules that should not be published from the waitForPublishedArtifacts (#366)

Author: ndr-brt

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

@@ -23,8 +23,6 @@
 
 public class MavenPublicationConvention implements EdcConvention {
 
-    private static final boolean DEFAULT_SHOULD_PUBLISH = true;
-
     @Override
     public void apply(Project target) {
         // do not publish the root project or modules without a build.gradle.kts
@@ -33,9 +31,8 @@ public void apply(Project target) {
         }
 
         var buildExtension = requireExtension(target, BuildExtension.class);
-        var shouldPublish = buildExtension.getPublish().getOrElse(DEFAULT_SHOULD_PUBLISH);
 
-        if (shouldPublish) {
+        if (buildExtension.shouldPublish()) {
             target.getPlugins().apply(MavenPublishPlugin.class);
 
             target.getExtensions().configure(MavenPublishBaseExtension.class, extension -> {

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

@@ -24,6 +24,9 @@
  * Root configuration resource for the EDC Build plugin
  */
 public abstract class BuildExtension {
+
+    private static final boolean DEFAULT_SHOULD_PUBLISH = true;
+
     private final MavenPomExtension pom;
     private final SwaggerGeneratorExtension swagger;
 
@@ -50,6 +53,15 @@ public SwaggerGeneratorExtension getSwagger() {
         return swagger;
     }
 
+    /**
+     * Tell if the module needs to be published
+     *
+     * @return true if the module needs to be published, false otherwise
+     */
+    public boolean shouldPublish() {
+        return getPublish().getOrElse(DEFAULT_SHOULD_PUBLISH);
+    }
+
     public abstract Property<Boolean> getPublish();
 
 }

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

@@ -14,6 +14,7 @@
 
 package org.eclipse.edc.plugins.edcbuild.tasks;
 
+import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.publish.PublishingExtension;
@@ -37,6 +38,10 @@ public class WaitForPublishedArtifacts extends DefaultTask {
 
     @TaskAction
     public void waitForPublishedArtifacts() {
+        if (!requireExtension(getProject(), BuildExtension.class).shouldPublish()) {
+            return;
+        }
+
         requireExtension(getProject(), PublishingExtension.class)
                 .getPublications().stream()
                 .map(MavenPublication.class::cast)