update to Grails 7, Gradle 8.10, Groovy 4.0.23 + remaining dependencies

grails · Oct 12, 2024 · 18b49b6 · 18b49b6
1 parent 078056b
commit 18b49b6
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 56 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -20,8 +20,8 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
- distribution: 'adopt'
- java-version: '11'
+ distribution: 'liberica'
+ java-version: '17'
  - name: Run Build
  if: success()
  id: build
@@ -49,8 +49,8 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
- distribution: 'adopt'
- java-version: '11'
+ distribution: 'liberica'
+ java-version: '17'
  - name: Publish to repo.grails.org
  id: publish
  uses: gradle/gradle-build-action@v3
@@ -74,8 +74,8 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
- distribution: 'adopt'
- java-version: '11'
+ distribution: 'liberica'
+ java-version: '17'
  - name: Build Docs
  id: docs
  if: success()
@@ -96,5 +96,5 @@ jobs:
  BRANCH: gh-pages
  FOLDER: build/docs
  DOC_FOLDER: gh-pages
- COMMIT_EMAIL: [email protected]
- COMMIT_NAME: Puneet Behl
+ COMMIT_EMAIL: '[email protected]'
+ COMMIT_NAME: grails-build'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,8 +10,8 @@ jobs:
  permissions:
  contents: read
  env:
- GIT_USER_NAME: puneetbehl
- GIT_USER_EMAIL: [email protected]
+ GIT_USER_NAME: 'grails-build'
+ GIT_USER_EMAIL: '[email protected]'
  steps:
  - name: Checkout repository
  uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
- distribution: 'adopt'
- java-version: '11'
+ distribution: 'liberica'
+ java-version: '17'
  - name: Set the current release version
  id: release_version
  run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -115,8 +115,8 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
- distribution: 'adopt'
- java-version: '11'
+ distribution: 'liberica'
+ java-version: '17'
  - name: Publish Documentation
  id: docs
  if: success() || false
@@ -137,6 +137,6 @@ jobs:
  BRANCH: gh-pages
  FOLDER: build/docs
  DOC_FOLDER: gh-pages
- COMMIT_EMAIL: [email protected]
- COMMIT_NAME: Puneet Behl
+ COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
+ COMMIT_NAME: ${{ env.GIT_USER_NAME }}
  VERSION: ${{ steps.release_version.outputs.release_version }}
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
  }
  dependencies {
  classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
+ classpath "org.asciidoctor:asciidoctor-gradle-plugin:$asciidoctorGradlePlugin"
  classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
  }
 }
@@ -50,7 +50,7 @@ dependencies {
  api "org.grails:grails-plugin-interceptors"
  api "org.grails.plugins:async"
  api "org.grails.plugins:scaffolding"
- api "org.codehaus.gpars:gpars:1.2.1"
+ api "org.codehaus.gpars:gpars:$gparsVersion"
  api "org.grails.plugins:gsp"
 
  runtimeOnly "org.grails.plugins:async"
@@ -75,7 +75,7 @@ dependencies {
  testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
  testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 
- api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2"
+ api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentlinkedhashmapLruVersion"
 }
 
 apply from: rootProject.file('gradle/testVerbose.gradle')

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,26 @@
-projectVersion=8.0.0-SNAPSHOT
-grailsVersion=6.1.2
-grailsGradlePluginVersion=6.1.2
-gormVersion=8.1.1
-groovyVersion=3.0.11
+projectVersion=8.0.25-SNAPSHOT
+
+asciidoctorGradlePlugin=1.6.1
+concurrentlinkedhashmapLruVersion=1.4.2
+grailsVersion=7.0.0-SNAPSHOT
+grailsGradlePluginVersion=7.0.0-SNAPSHOT
+gormVersion=9.0.0-SNAPSHOT
+gparsVersion=1.2.1
+groovyVersion=4.0.23
 githubSlug=grails/grails-cache
-githubBranch=6.0.x
+githubBranch=8.0.x
 title=Cache Plugin
 projectDesc=Provides AST transformations for caching method calls
 guide=../../guide
 tags=../ref/Tags
-gebVersion=6.0
-seleniumVersion=4.18.1
+gebVersion=7.0
+seleniumVersion=4.25.0
+
 webdriverBinariesVersion=3.2
-hibernateCoreVersion=5.1.5.Final
+chromeDriverVersion=126.0.6478.126
 geckodriverVersion=0.32.2
-seleniumSafariDriverVersion=4.18.1
-chromeDriverVersion=110.0.5481.77
+seleniumSafariDriverVersion=4.25.0
+
 org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +134,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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 
+ # shellcheck disable=SC2039,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 
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/grails-wrapper.jar b/grails-wrapper.jar
diff --git a/src/main/groovy/grails/plugin/cache/CacheGrailsPlugin.groovy b/src/main/groovy/grails/plugin/cache/CacheGrailsPlugin.groovy
@@ -24,7 +24,7 @@ import org.springframework.cache.Cache
 @Slf4j
 class CacheGrailsPlugin extends Plugin {
 
- def grailsVersion = "4.0.0 > *"
+ def grailsVersion = "7.0.0 > *"
  def observe = ['controllers', 'services']
  def loadAfter = ['controllers', 'services']
  def authorEmail = '[email protected]'

diff --git a/src/test/groovy/grails/plugin/cache/CacheTagLibSpec.groovy b/src/test/groovy/grails/plugin/cache/CacheTagLibSpec.groovy
@@ -7,7 +7,7 @@ import org.grails.web.gsp.GroovyPagesTemplateRenderer
 import org.springframework.cache.Cache
 import spock.lang.Specification
 
-import javax.servlet.ServletException
+import jakarta.servlet.ServletException
 
 
 class CacheTagLibSpec extends Specification implements TagLibUnitTest<CacheTagLib> {