diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 273e4777..45e7a0c1 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -2,18 +2,18 @@ name: Java CI
 on:
   push:
     branches:
-      - master
       - '[2-9]+.[1-9]+.x'
+      - '[3-9]+.[0-9]+.x'
   pull_request:
     branches:
-      - master
       - '[2-9]+.[1-9]+.x'
+      - '[3-9]+.[0-9]+.x'
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '14']
+        java: ['11', '14']
     env:
       WORKSPACE: ${{ github.workspace }}
       GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
@@ -31,6 +31,7 @@ jobs:
         with:
           arguments: check
         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: Run Build
@@ -51,21 +52,28 @@ jobs:
           report_paths: '**/build/test-results/test/TEST-*.xml'
       - name: Publish to repo.grails.org
         id: publish
-        if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
+        if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
         uses: gradle/gradle-build-action@v2
+        with:
+          arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        with:
-          arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
+          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: Generate Docs
         id: docs
-        if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
+        if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
         uses: gradle/gradle-build-action@v2
         with:
           arguments: docs
+        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' && matrix.java == '8'
+        if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           TARGET_REPOSITORY: ${{ github.repository }}
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index e9611b2e..a913f1bc 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - '[2-9]+.[1-9]+.x'
+      - '[3-9]+.[0-9]+.x'
   workflow_dispatch:      
 jobs:
   release_notes:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fcba26a..78c79cc7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['11']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: behlp@objectcomputing.com
@@ -37,6 +37,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_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -51,6 +54,10 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: docs
+        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: Export Gradle Properties
         uses: micronaut-projects/github-actions/export-gradle-properties@master
       - name: Publish to Github Pages
diff --git a/.github/workflows/retry-release.yml b/.github/workflows/retry-release.yml
index e0f06bff..973ae742 100644
--- a/.github/workflows/retry-release.yml
+++ b/.github/workflows/retry-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['11']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: behlp@objectcomputing.com
diff --git a/build.gradle b/build.gradle
index 25d99313..22039de2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
         classpath "org.grails:grails-docs:${project.ext.properties.grailsDocsVersion ?: grailsVersion}"
         classpath "org.grails.plugins:views-gradle:$jsonViewsVersion"
         classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
+        classpath("org.asciidoctor:asciidoctor-gradle-jvm:4.0.0-alpha.1")
     }
 }
 
@@ -18,7 +19,7 @@ repositories {
 version project.projectVersion
 
 ext {
-    commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/master'
+    commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/gradle7'
 }
 
 subprojects { project ->
@@ -39,7 +40,7 @@ subprojects { project ->
 
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
-        if(groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
+        if (groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
             maven {
                 name 'JFrog OSS snapshot repo'
                 url 'https://oss.jfrog.org/oss-snapshot-local/'
@@ -59,16 +60,15 @@ subprojects { project ->
             apply from: "${commonBuild}/common-project.gradle"
         }
 
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 1.11
+        targetCompatibility = 1.11
     }
 
     configurations.all {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if(details.requested.group == 'org.springframework') {
+            if (details.requested.group == 'org.springframework') {
                 details.useVersion(springVersion)
-            }
-            else if(details.requested.group == 'org.springframework.boot') {
+            } else if (details.requested.group == 'org.springframework.boot') {
                 details.useVersion(springBootVersion)
             }
         }
@@ -80,9 +80,9 @@ subprojects { project ->
 
         testImplementation "javax.servlet:javax.servlet-api:$servletApiVersion"
         testImplementation "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
-        testImplementation "org.junit.platform:junit-platform-runner:1.9.2"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
+        testImplementation "org.junit.platform:junit-platform-runner:1.9.3"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.3"
     }
 
     tasks.withType(Test) {
diff --git a/examples/demo33/build.gradle b/examples/demo33/build.gradle
index fd9e358a..20881236 100644
--- a/examples/demo33/build.gradle
+++ b/examples/demo33/build.gradle
@@ -89,6 +89,9 @@ tasks.withType(Test) {
     }
 }
 
+tasks.withType(Jar).configureEach {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
 
 
 
diff --git a/examples/demo33/gradle.properties b/examples/demo33/gradle.properties
index 07f9c5e8..8b29acaa 100644
--- a/examples/demo33/gradle.properties
+++ b/examples/demo33/gradle.properties
@@ -1,9 +1,6 @@
-grailsVersion=5.0.3-SNAPSHOT
-gormVersion=7.1.0
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
 geckodriverVersion=0.26.0
 chromeDriverVersion=96.0.4664.45
-micrometer.version=1.8.0
-micronaut.spring.version=4.0.1
\ No newline at end of file
+micrometer.version=1.8.0
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7dabaa17..c1b0bccb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,22 +1,22 @@
-projectVersion=2.6.2-SNAPSHOT
+projectVersion=3.0.0-SNAPSHOT
 title=Grails Testing Support
 authors=Jeff Brown,James Kleeh
 projectDesc=Support for writing concise expressive tests for Grails artifacts
 projectUrl=https://github.com/grails/grails-testing-support
 githubSlug=grails/grails-testing-support
-githubBranch=2.3.x
+githubBranch=3.0.x
 developers=Jeff Brown,James Kleeh
-grailsGradlePluginVersion=5.3.0
-grailsVersion=5.3.2
-grailsDocsVersion=5.0.0.RC1
+grailsGradlePluginVersion=6.0.0-M2
+grailsVersion=6.0.0-M2
+grailsDocsVersion=6.0.0-SNAPSHOT
 asyncVersion=4.0.0
 groovyVersion=3.0.11
-gormVersion=7.3.4
+gormVersion=8.0.0-M2
 jsonViewsVersion=2.3.2
-gspVersion=5.3.0
+gspVersion=6.0.0-M1
 spockVersion=2.1-groovy-3.0
-springVersion=5.3.20
-springBootVersion=2.7.9
+springVersion=6.0.9
+springBootVersion=2.7.11
 slf4jVersion=1.7.22
 junitVersion=4.12
 javassistVersion=3.29.2-GA
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..943f0cbf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 53b9e380..50832291 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/grails-testing-support/build.gradle b/grails-testing-support/build.gradle
index 1f94f121..114be8b7 100755
--- a/grails-testing-support/build.gradle
+++ b/grails-testing-support/build.gradle
@@ -26,8 +26,8 @@ dependencies {
     api("org.spockframework:spock-spring:${spockVersion}") { transitive = false }
     api("org.spockframework:spock-core:${spockVersion}") { transitive = false }
     api "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
-    api "org.junit.jupiter:junit-jupiter-api:5.9.2"
-    api "org.junit.platform:junit-platform-runner:1.9.2"
-    runtimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
+    api "org.junit.jupiter:junit-jupiter-api:5.9.3"
+    api "org.junit.platform:junit-platform-runner:1.9.3"
+    runtimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.3"
 }
 
diff --git a/settings.gradle b/settings.gradle
index 9fc56461..0c9227df 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.12.4"
+    id "com.gradle.enterprise" version "3.13.2"
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
 }