From 772b9e592a7bb556896a5457b501df9bfa83b679 Mon Sep 17 00:00:00 2001
From: Todd Baert <toddbaert@gmail.com>
Date: Mon, 29 Aug 2022 23:27:03 -0400
Subject: [PATCH] fix: build issue with single publish

Signed-off-by: Todd Baert <toddbaert@gmail.com>
---
 .github/workflows/release-please.yml                  | 11 +++++++++--
 hooks/open-telemetry/pom.xml                          |  5 -----
 pom.xml                                               |  4 +---
 providers/flagd/pom.xml                               |  5 -----
 .../contrib/providers/flagd/FlagdProvider.java        |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 971796eaf..f41e5f092 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -53,11 +53,18 @@ jobs:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
 
       # Release Please has already incremented versions and published tags, so we just need to publish.
-      # Our maven config will only publish versions that do not already exist.
       - name: Maven Verify Deploy
         if: ${{ steps.release.outputs.releases_created }}
+        # The nexus-staging-maven-plugin doesn't follow maven conventions. It stages all the projects with the last submodule: https://help.sonatype.com/repomanager2/staging-releases/configuring-your-project-for-deployment
+        # This means there's no way to skip publishing of a particular module in a multi-module build, so we iterate over each module and publish them individually,
+        # letting exists-maven-plugin skip the nexus-staging-maven-plugin's entire deploy goal if the artifact exists.
         run: |
-          mvn --batch-mode --settings release/m2-settings.xml verify deploy
+          modules=($(cat pom.xml | grep "<module>" | sed 's/\s*<.*>\(.*\)<.*>/\1/'))
+
+          for module in "${modules[@]}"
+          do
+              mvn --batch-mode --projects $module --settings release/m2-settings.xml  clean deploy
+          done
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/hooks/open-telemetry/pom.xml b/hooks/open-telemetry/pom.xml
index d7fe2f8cb..69c713b93 100644
--- a/hooks/open-telemetry/pom.xml
+++ b/hooks/open-telemetry/pom.xml
@@ -24,11 +24,6 @@
 		</developer>
 	</developers>
 
-	<properties>
-		<!-- override no-deploy rule from parent -->
-		<maven.deploy.skip>false</maven.deploy.skip>
-	</properties>
-
 	<dependencies>
 		<!-- we inherent dev.openfeature.javasdk and the test dependencies from the parent pom -->
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 0d5e545b2..a8c04769c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,6 @@
     </scm>
 
     <properties>
-        <!-- skip deploy in parent (need to override this in submodules) -->
-        <maven.deploy.skip>true</maven.deploy.skip>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <junit.jupiter.version>5.8.1</junit.jupiter.version>
@@ -250,7 +248,7 @@
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
-                        <phase>verify</phase>
+                        <phase>deploy</phase>
                         <goals>
                             <goal>sign</goal>
                         </goals>
diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
index 136d80795..83440d82a 100644
--- a/providers/flagd/pom.xml
+++ b/providers/flagd/pom.xml
@@ -24,11 +24,6 @@
 		</developer>
 	</developers>
 
-	<properties>
-		<!-- override no-deploy rule from parent -->
-		<maven.deploy.skip>false</maven.deploy.skip>
-	</properties>
-
 	<dependencies>
 		<!-- we inherent dev.openfeature.javasdk and the test dependencies from the parent pom -->
 	</dependencies>
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
index 8c81a3cc2..6c0a169fe 100644
--- a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
+++ b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
@@ -16,7 +16,7 @@ public FlagdProvider() {
     }
 
     /** 
-     * A test method...
+     * A test method.
      * 
      * @return {boolean}
      */