From e16adacfb9f903d0bb3e293771145964d5962880 Mon Sep 17 00:00:00 2001
From: Jean-Kevin KPADEY <kpadeyjk@gmail.com>
Date: Sun, 19 May 2024 14:23:29 +0200
Subject: [PATCH] Fix gpg signing after plugin update

---
 .github/workflows/deploy.yml | 4 ++--
 .settings.xml                | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5ca623e7..4f64ce85 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -21,14 +21,14 @@ jobs:
           server-username: SONATYPE_USERNAME
           server-password: SONATYPE_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-          gpg-passphrase: GPG_PASSPHRASE
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Publish to Apache Maven Central
         run: mvn clean -DskipTests deploy --settings .settings.xml -P release,ossrh
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Upload jars file
         uses: actions/upload-artifact@v4
diff --git a/.settings.xml b/.settings.xml
index ec9cefcc..acbca70c 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -7,6 +7,10 @@
             <username>${env.SONATYPE_USERNAME}</username>
             <password>${env.SONATYPE_PASSWORD}</password>
         </server>
+        <server>
+            <id>gpg.passphrase</id>
+            <passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase>
+        </server>
     </servers>
 
     <profiles>
@@ -15,9 +19,6 @@
         <activation>
           <activeByDefault>false</activeByDefault>
         </activation>
-        <properties>
-          <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
-        </properties>
       </profile>
     </profiles>
 </settings>