From e3a5db718d76d964219e29259cc2093fe3cd705a Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement@apache.org>
Date: Wed, 28 Aug 2024 14:22:43 +0200
Subject: [PATCH] Update release process.

---
 .github/workflows/release.yml | 30 ++++++++++++++++--------------
 .github/workflows/website.yml |  7 ++-----
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f557c97..739cf103 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,33 +26,35 @@ jobs:
         with:
           token: ${{secrets.RELEASE_TOKEN}}
 
-      - uses: actions/setup-java@v4
+      - name: Java setup
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
-          distribution: temurin
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+          server-id: 'oss.sonatype'
+          server-username: 'MAVEN_DEPLOY_USERNAME'
+          server-password: 'MAVEN_DEPLOY_TOKEN'
+          gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}}
+          gpg-passphrase: 'MAVEN_GPG_PASSPHRASE'
 
       - name: maven release ${{steps.metadata.outputs.current-version}}
+        env:
+          MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}}
+          MAVEN_DEPLOY_TOKEN: ${{secrets.MAVEN_DEPLOY_TOKEN}}
+          MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}}
         run: |
           java -version
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          gpg --fast-import --no-tty --batch --yes smallrye-sign.asc
           git config --global user.name "SmallRye CI"
           git config --global user.email "smallrye@googlegroups.com"
           git checkout -b release
-          mvn -B release:prepare -Prelease,coverage -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
+          mvn -B release:prepare -Prelease,coverage -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
           git checkout ${{github.base_ref}}
           git rebase release
-          mvn -B release:perform -Prelease -s maven-settings.xml
+          mvn -B release:perform -Prelease
           git push
           git push --tags
 
-      - uses: actions/upload-artifact@v4
-        name: tck-report
-        with:
-          name: tck-report
-          path: testsuite/tck/target/surefire-reports
-
       - uses: radcortez/milestone-release-action@main
         name: milestone release
         with:
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 865cf663..d0f8e2c2 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -25,10 +25,7 @@ jobs:
         with:
           python-version: 3.x
       - name: Tools setup
-        run: |
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          gpg --fast-import --no-tty --batch --yes smallrye-sign.asc
+        run: |          
           git config --global user.name "SmallRye CI"
           git config --global user.email "smallrye@googlegroups.com"
           cd docs
@@ -37,6 +34,6 @@ jobs:
           pipenv install
           cd ..
       - name: Build local artifacts
-        run: mvn -B install -DskipTests -Prelease -s maven-settings.xml
+        run: mvn -B install -DskipTests
       - name: Render docs and publish
         run: .github/render-documentation.sh
\ No newline at end of file