From 5846c14a4f353f3c402875f2c15f252ecd464cb6 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Thu, 25 Jan 2024 15:11:18 -0300
Subject: [PATCH] Update release workflow

---
 .github/release/maven-settings.xml.gpg | Bin 856 -> 0 bytes
 .github/workflows/release.yml          |  73 +++++++++++++------------
 2 files changed, 37 insertions(+), 36 deletions(-)
 delete mode 100644 .github/release/maven-settings.xml.gpg

diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg
deleted file mode 100644
index b342f7c1f62cd53c74527af166e36c3b5b45e701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 856
zcmV-e1E>6j0t^F0JI%MV2--pc5CF7mLz1Q7ICpW1>rN1SZ93bnmX$kRj7+ymY|l~M
zOfF{8Ib7y8Q5zngSD0_9X+<Vo!t-rtfD3mjDy$M$rivjYE)O5*tb|l4FzmE|k3=#_
z9ulSFpYXy^LWJ?(&`iNd-_NGnh3F%H_3~3Hai0I2To<}R+G$d2P0%<TKnS=&iTe#Q
zby@{f2{<cpW0CDh_`Q8Ig(z7yx+pN7VQqS;-T`g}=Auxlp+;{Z)1RscGk$kge&>rR
zc``gl)ud618Zp}e;4U@9lLqZ_fhr#mw5Ru)HY-1v0nZ2OEC~wk&jY5Pd%x$B<ac2L
z3rwa71NVr!F-sP03cZx3Y)B{f2~dxMDlh-ma*aawDdw9H<b0z~|C0vY3p}F6(Won4
z{NSg@Ql^@E8djExd&yvaC(iJ;gDrD1_S5xj05@qK<*-f$PrD%uKQs?jKI1-G9h1lW
zu7pfHJJghIzi$l!3RwnJ<=~Xm6LEnKhz}IDIa-xM?DPUe3D2A5a3_uYx0qUkxqu9)
zogXj`JlNVQeNl4etbPME$sF)~vSwSyY_Q?y^Dpowe&)84itZSYAxiQaTiM~uJ!|b!
zJrx(k&9bK&@TB##)cd39%6oCBo4tN2TDv&n2_KoAG8ljEg}^pY(FD^&<DRi)IwFnx
z?!cwuD3<t=AXo5C0!h-qh5>^9I!4z?zBXg@pHP|3lkb30WIU3o5XDbh6t7$2h=RxS
zn|03P=#^E>+XI~<;JU}oRxET~k%b&XTX_yvW97@sl*GH+6_I3@f7HojrCJ7zM=5QG
z+m3d#f<IRL>t?Y8B4+pAWSgL&sR^}asK=6s93y^uwJ?cr*2Qbr8i7PMQ2rxOpp<y+
z#JcGeYX@nU&4i46`_q{+ElUwh34oM*)5eo)cQ=vv^Qx+oTby6uq2<u+oJj#6X*{c;
z$lwlPuwK+iN6|`l9rJ$bh1<68aT04%_vKeO(AagKc9ey_mQxbax*{)25r;6M-b~aY
zxbiWPN}zl?VG+q2N^i@HvjDzxg8Z^w?S2t1x4{dU#dwm$rBz9${ctLoh&GMCxjjl%
i9}2TYlpd?fELVqENP7EU{^J5s_fBIIoyW5i!c|vM`=M|E

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8ab1fe9..00576e9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,14 @@ on:
     paths:
       - '.github/project.yml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -13,57 +21,50 @@ jobs:
     if: ${{github.event.pull_request.merged == true}}
 
     steps:
-      - uses: radcortez/project-metadata-action@1.0
+      - uses: radcortez/project-metadata-action@main
         name: Retrieve project metadata
         id: metadata
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           metadata-file-path: '.github/project.yml'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Import GPG key
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v3
-        with:
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-
-      - uses: actions/setup-java@v1.4.3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 11
-
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          cache: 'maven'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Configure Git author
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
 
-      - name: Maven release ${{steps.metadata.outputs.current-version}}
+      - name: Update latest release version in docs
         run: |
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          git checkout -b release
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
-          git checkout ${{github.base_ref}}
-          git rebase release
-          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease -s maven-settings.xml
+          mvn -B -ntp -pl docs -am generate-resources -Denforcer.skip -Dformatter.skip -Dimpsort.skip
+          if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
+            git add docs/modules/ROOT/pages/includes/attributes.adoc
+            git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation"
+          fi
 
-      - name: Push changes to ${{github.base_ref}}
-        uses: ad-m/github-push-action@v0.6.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{github.base_ref}}
+      - name: Maven release ${{steps.metadata.outputs.current-version}}
+        run: |
+          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Push tags
-        uses: ad-m/github-push-action@v0.6.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          tags: true
-          branch: ${{github.base_ref}}
+      - name: Push changes to ${{github.base_ref}} branch
+        run: |
+          git push
+          git push origin ${{steps.metadata.outputs.current-version}}