From 02d71c2a17113f8f0d5a769d09bbecaef4a41266 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Fri, 20 Oct 2023 16:51:12 -0400
Subject: [PATCH] Use `secrets.GH_ACTIONS_REPO_TOKEN`

---
 .github/workflows/ci-snapshot.yml     | 11 +++++------
 .github/workflows/release-staging.yml | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml
index 647cb0f..a281580 100644
--- a/.github/workflows/ci-snapshot.yml
+++ b/.github/workflows/ci-snapshot.yml
@@ -19,12 +19,11 @@ jobs:
     steps:
 
       - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
         with:
-          distribution: adopt
-          java-version: 17
-          cache: gradle
+          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+
+      - name: Set up Gradle
+        uses: spring-io/spring-gradle-build-action@v2
 
       - uses: jfrog/setup-jfrog-cli@v3
         with:
@@ -47,6 +46,6 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf gradle build dist artifactoryPublish -Duser.name=spring-builds+github
+          jf gradle build dist artifactoryPublish
           jf rt build-publish
 
diff --git a/.github/workflows/release-staging.yml b/.github/workflows/release-staging.yml
index a474632..e241009 100644
--- a/.github/workflows/release-staging.yml
+++ b/.github/workflows/release-staging.yml
@@ -24,12 +24,11 @@ jobs:
     steps:
 
       - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
         with:
-          distribution: adopt
-          java-version: 17
-          cache: gradle
+          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+
+      - name: Set up Gradle
+        uses: spring-io/spring-gradle-build-action@v2
 
       - uses: jfrog/setup-jfrog-cli@v3
         with:
@@ -56,13 +55,13 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf gradle build dist artifactoryPublish -Duser.name=spring-builds+github
+          jf gradle build dist artifactoryPublish
           jf rt build-publish
 
       - name: Tag Release and Next Development Version
         run: |
-          git config user.name 'github-actions[bot]'
-          git config user.email 'github-actions[bot]@users.noreply.github.com'
+          git config --global user.name 'Spring Builds'
+          git config --global user.email 'builds@springframework.org'
           git commit -a -m "[artifactory-release] Release version ${{ inputs.releaseVersion }}"
           git tag "v${{ inputs.releaseVersion }}"
           git push --tags origin