Merge branch '3.1.x' into 4.0.x

# Conflicts:
#	.github/workflows/release.yml

Author: jamesfredley

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
       WORKSPACE: ${{ github.workspace }}
       GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/cache@v2
         with:
           path: ~/.gradle/caches

.github/workflows/release-notes.yml

@@ -21,8 +21,8 @@ jobs:
       # If it has release drafter:
       - uses: release-drafter/[email protected]
         if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        # env:
+        #   GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           prerelease: false
           commitish: main
@@ -33,8 +33,8 @@ jobs:
       - uses: micronaut-projects/github-actions/release-notes@master
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
         id: release_notes
-        with:
-          token: ${{ secrets.GH_TOKEN }}
+        # with:
+        #   token: ${{ secrets.GH_TOKEN }}
       - uses: ncipollo/release-action@v1
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false' && steps.release_notes.outputs.generated_changelog == 'true'
         with:

.github/workflows/release.yml

@@ -13,9 +13,7 @@ jobs:
       GIT_USER_EMAIL: '[email protected]'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GH_TOKEN }}
+        uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
         uses: actions/setup-java@v1
@@ -42,8 +40,8 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USER_TOKEN_NAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_USER_TOKEN_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}

README.md

@@ -6,9 +6,10 @@
 Versions
 ---
 
-| Grails                 | Wrapper                                                       |
-|------------------------|---------------------------------------------------------------|
-| 5.0.0 - 5.3.3          | [3.0.0.M1](https://github.com/grails/grails-wrapper/releases) |
-| 5.3.4 - 5.3.X          | [3.1.0](https://github.com/grails/grails-wrapper/releases)    |
-| 6.0.0+                 | [4.0.0](https://github.com/grails/grails-wrapper/releases) |
+| Grails        | Wrapper                                                       |
+|---------------|---------------------------------------------------------------|
+| 5.0.0 - 5.3.3 | [3.0.0.M1](https://github.com/grails/grails-wrapper/releases) |
+| 5.3.4 - 5.3.X | [3.1.0](https://github.com/grails/grails-wrapper/releases)    |
+| 6.x.x         | [4.0.0](https://github.com/grails/grails-wrapper/releases)    |
+| 7.x.x         | [5.0.0](https://github.com/grails/grails-wrapper/releases)    |