Remove legacy GPG settings in workflows

Refs #4012
dropwizard · Mar 17, 2024 · 6b19832 · 6b19832
1 parent 3d93973
commit 6b19832
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
     - name: Build and Deploy
-      run: ./mvnw -B -V -ntp -Dgpg.signer=bc -DperformRelease=true deploy
+      run: ./mvnw -B -V -ntp -DperformRelease=true deploy
       env:
         CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -31,8 +31,6 @@ jobs:
         server-id: ossrh
         server-username: ${{ secrets.CI_DEPLOY_USERNAME }}
         server-password: ${{ secrets.CI_DEPLOY_PASSWORD }}
-        gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-        gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
     - name: Set up Git
       run: |
         git config --global committer.email "48418865+dropwizard-committers@users.noreply.github.com"
@@ -41,6 +39,9 @@ jobs:
         git config --global author.name "${GITHUB_ACTOR}"
     - name: Prepare release
       run: ./mvnw -V -B -ntp -Prelease -DreleaseVersion=${{ inputs.releaseVersion }} -DdevelopmentVersion=${{ inputs.developmentVersion }} release:prepare
+      env:
+        MAVEN_GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
     - name: Rollback on failure
       if: failure()
       run: |

diff --git a/pom.xml b/pom.xml
@@ -208,9 +208,6 @@
                     <value>true</value>
                 </property>
             </activation>
-            <properties>
-                <gpg.keyname>EDA86E9FB607B5FC9223FB767D4868B53E31E7AD</gpg.keyname>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -242,6 +239,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>3.2.0</version>
+                        <configuration>
+                            <signer>bc</signer>
+                            <bestPractices>true</bestPractices>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>