Merge branch '4.0.x' into renovate/major-grailsgradlepluginversion

grails · Dec 20, 2023 · cc431c1 · cc431c1
2 parents 9423496 + eb31309
commit cc431c1
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 66 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -8,38 +8,23 @@ on:
       - '[3-9]+.[0-9]+.x'
   workflow_dispatch:
 jobs:
-  container-job:
+  build:
     runs-on: ubuntu-latest
-    container: node:10.22-jessie
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      WORKSPACE: ${{ github.workspace }}
-      GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
+    strategy:
+      matrix:
+        redis-version: [6, 7]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 8
-      - name: Run Tests
-        if: github.event_name == 'pull_request'
-        id: tests
-        uses: gradle/gradle-build-action@v2
+          java-version: 11
+      - name: Setup Redis
+        uses: supercharge/[email protected]
         with:
-          arguments: check -Dgeb.env=chromeHeadless
-        env:
-          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 }}
+          redis-version: ${{ matrix.redis-version }}
       - name: Run Build
-        if: github.event_name == 'push'
         id: build
         uses: gradle/gradle-build-action@v2
         env:
@@ -50,35 +35,45 @@ jobs:
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: build -Dgeb.env=chromeHeadless
-      - name: Publish Test Report
-        if: steps.build.outcome == 'failure' || steps.tests.outcome == 'failure'
-        uses: scacap/action-surefire-report@v1
+  publish:
+    if: github.event_name == 'push'
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          report_paths: '**/build/test-results/test/TEST-*.xml'
-      - name: Publish to repo.grails.org
+          distribution: 'adopt'
+          java-version: 11
+      - name: Publish Artifacts (repo.grails.org)
         id: publish
         uses: gradle/gradle-build-action@v2
-        if: steps.build.outcome == 'success' && github.event_name == 'push'
         env:
+          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 }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         with:
           arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
       - name: Build Docs
         id: docs
-        if: steps.build.outcome == 'success' && github.event_name == 'push'
+        if: success()
         uses: gradle/gradle-build-action@v2
         with:
           arguments: :grails-redis:groovydoc
+        env:
+          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 }}
       - name: Publish to Github Pages
-        if: steps.docs.outcome == 'success' && github.event_name == 'push'
-        uses: micronaut-projects/github-pages-deploy-action@master
+        if: success()
+        uses: grails/github-pages-deploy-action@v2.0.2
         env:
           TARGET_REPOSITORY: ${{ github.repository }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BRANCH: gh-pages
           FOLDER: plugin/build/docs
           DOC_FOLDER: gh-pages
-          COMMIT_EMAIL: behlp@objectcomputing.com
+          COMMIT_EMAIL: behlp@unityfoundation.io
           COMMIT_NAME: Puneet Behl
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -10,7 +10,7 @@ jobs:
   release_notes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check if it has release drafter config file
         id: check_release_drafter
         run: |
@@ -20,7 +20,7 @@ jobs:
         id: extract_branch
         run: echo ::set-output name=value::${GITHUB_REF:11}
       # If it has release drafter:
-      - uses: release-drafter/release-drafter@v5.24.0
+      - uses: release-drafter/release-drafter@v5.25.0
         if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,23 +5,19 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: ['8']
     env:
       GIT_USER_NAME: puneetbehl
-      GIT_USER_EMAIL: behlp@objectcomputing.com
+      GIT_USER_EMAIL: behlp@unityfoundation.io
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
-      - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java }}
+          java-version: '11'
       - name: Set the current release version
         id: release_version
         run: echo ::set-output name=release_version::${GITHUB_REF:11}
@@ -37,6 +33,9 @@ jobs:
         id: publish
         uses: gradle/gradle-build-action@v2
         env:
+          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_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
@@ -47,28 +46,29 @@ jobs:
         with:
           arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository
       - name: Publish Documentation
-        id: docs
-        if: steps.publish.outcome == 'success'
+        if: success()
         uses: gradle/gradle-build-action@v2
         with:
           arguments: :grails-redis:groovydoc
-      - name: Export Gradle Properties
-        uses: micronaut-projects/github-actions/export-gradle-properties@master
+        env:
+          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 }}
       - name: Publish to Github Pages
-        if: steps.docs.outcome == 'success'
-        uses: micronaut-projects/github-pages-deploy-action@master
+        if: success()
+        uses: grails/github-pages-deploy-action@v2.0.2
         env:
-          BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
+          SKIP_SNAPSHOT: ${{ contains(steps.release_version.outputs.release_version, 'M') }}
           TARGET_REPOSITORY: ${{ github.repository }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BRANCH: gh-pages
           FOLDER: plugin/build/docs
           DOC_FOLDER: gh-pages
-          COMMIT_EMAIL: behlp@objectcomputing.com
+          COMMIT_EMAIL: behlp@unityfoundation.io
           COMMIT_NAME: Puneet Behl
           VERSION: ${{ steps.release_version.outputs.release_version }}
       - name: Run post-release
-        if: steps.publish.outcome == 'success' && steps.docs.outcome == 'success' && success()
+        if: success()
         uses: micronaut-projects/github-actions/post-release@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.github.gradle-nexus.publish-plugin' version '1.2.0'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 }
 
 ext.isSnapshot = project.projectVersion.endsWith('-SNAPSHOT')

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-projectVersion=3.1.0-SNAPSHOT
-grailsVersion=5.3.3
-grailsGradlePluginVersion=6.0.0
+projectVersion=4.0.1-SNAPSHOT
+grailsVersion=6.1.1
+grailsGradlePluginVersion=6.1.1
 org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -22,8 +22,8 @@ apply plugin: "org.grails.grails-gsp"
 version project.projectVersion
 group "org.grails.plugins"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.11
+targetCompatibility = 1.11
 
 repositories {
     mavenCentral()
@@ -58,10 +58,10 @@ dependencies {
 
     console "org.grails:grails-console"
 
-    api 'redis.clients:jedis:4.4.5'
+    api 'redis.clients:jedis:5.1.0'
     api 'com.google.code.gson:gson:2.10.1'
 
-    documentation 'com.github.javaparser:javaparser-core:3.15.14'
+    documentation 'com.github.javaparser:javaparser-core:3.25.7'
 }
 
 groovydoc {
@@ -118,7 +118,7 @@ publishing {
                     developer {
                         id = 'puneetbehl'
                         name = 'Puneet Behl'
-                        email = 'behlp@objectcomputing.com'
+                        email = 'behlp@unityfoundation.io'
                     }
                 }
                 scm {

diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 
 plugins {
-    id "com.gradle.enterprise" version "3.15"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.8.2'
+    id "com.gradle.enterprise" version "3.16.1"
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
 }
 
 gradleEnterprise {