Merge branch 'main' into release

nitrite · Jan 6, 2024 · 9433425 · 9433425
2 parents 54ce9c2 + 00c8448
commit 9433425
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,8 +5,6 @@ updates:
     schedule:
       interval: daily
     target-branch: main
-    ignore:
-      - dependency-name: "org.apache.maven.plugins:maven-gpg-plugin"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,17 +41,17 @@ jobs:
           openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5
           mkdir -p "$HOME"/.gnupg
           cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg
+          echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf
+          echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf
+          gpgconf --reload gpg-agent
         shell: bash
         env:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Release
-        run: |
-          export GPG_TTY=`tty`
-          mvn -B -ff -ntp deploy -DskipTests
+        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
         shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }}
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -41,14 +41,17 @@ jobs:
           openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5
           mkdir -p "$HOME"/.gnupg
           cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg
+          echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf
+          echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf
+          gpgconf --reload gpg-agent
         shell: bash
         env:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Snapshot
-        run: mvn -B -ff -ntp deploy -DskipTests
+        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+        shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }}
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Release 4.2.0 - Jan 5, 2024
+## Release 4.2.0 - Jan 6, 2024
 
 ### New Changes
 

diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
         <animal-sniffer.version>1.23</animal-sniffer.version>
         <api-level-24.version>7.0_r2</api-level-24.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
     </properties>
 
     <dependencyManagement>