Skip to content

Commit 9f9f897

Browse files
authored
fix: build issue with single publish (#79)
Signed-off-by: Todd Baert <[email protected]> Signed-off-by: Todd Baert <[email protected]>
1 parent ad1940d commit 9f9f897

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

Diff for: .github/workflows/release-please.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,18 @@ jobs:
5353
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
5454

5555
# Release Please has already incremented versions and published tags, so we just need to publish.
56-
# Our maven config will only publish versions that do not already exist.
5756
- name: Maven Verify Deploy
5857
if: ${{ steps.release.outputs.releases_created }}
58+
# 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
59+
# 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,
60+
# letting exists-maven-plugin skip the nexus-staging-maven-plugin's entire deploy goal if the artifact exists.
5961
run: |
60-
mvn --batch-mode --settings release/m2-settings.xml verify deploy
62+
mvn verify
63+
modules=($(mvn help:evaluate -Dexpression=project.modules | grep -v "^\[" | grep -v "<\/*strings>" | sed 's/<\/*string>//g' | sed 's/[[:space:]]//'))
64+
for module in "${modules[@]}"
65+
do
66+
mvn --batch-mode --projects $module --settings release/m2-settings.xml clean deploy
67+
done
6168
env:
6269
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6370
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

Diff for: hooks/open-telemetry/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
</developer>
2525
</developers>
2626

27-
<properties>
28-
<!-- override no-deploy rule from parent -->
29-
<maven.deploy.skip>false</maven.deploy.skip>
30-
</properties>
31-
3227
<dependencies>
3328
<!-- we inherent dev.openfeature.javasdk and the test dependencies from the parent pom -->
3429
</dependencies>

Diff for: pom.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
</scm>
2020

2121
<properties>
22-
<!-- skip deploy in parent (need to override this in submodules) -->
23-
<maven.deploy.skip>true</maven.deploy.skip>
2422
<maven.compiler.source>1.8</maven.compiler.source>
2523
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
2624
<junit.jupiter.version>5.8.1</junit.jupiter.version>
@@ -250,7 +248,7 @@
250248
<executions>
251249
<execution>
252250
<id>sign-artifacts</id>
253-
<phase>verify</phase>
251+
<phase>deploy</phase>
254252
<goals>
255253
<goal>sign</goal>
256254
</goals>

Diff for: providers/flagd/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
</developer>
2525
</developers>
2626

27-
<properties>
28-
<!-- override no-deploy rule from parent -->
29-
<maven.deploy.skip>false</maven.deploy.skip>
30-
</properties>
31-
3227
<dependencies>
3328
<!-- we inherent dev.openfeature.javasdk and the test dependencies from the parent pom -->
3429
</dependencies>

Diff for: providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public FlagdProvider() {
1616
}
1717

1818
/**
19-
* A test method...
19+
* A test method.
2020
*
2121
* @return {boolean}
2222
*/

0 commit comments

Comments
 (0)