Grails 7: grails-spring-security-cas

.github/workflows/gradle.yml

@@ -18,8 +18,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
       - name: Run Tests
         if: github.event_name == 'pull_request'
         id: tests

.github/workflows/release.yml

@@ -18,8 +18,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '17'
       - name: Set the current release version
         id: release_version
         run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -72,8 +72,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '17'
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -106,8 +106,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '17'
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
-        maven { url "https://repo.grails.org/grails/core" }
         mavenCentral()
+        maven { url "https://repo.grails.org/grails/core" }
         gradlePluginPortal()
     }
     dependencies {
@@ -14,25 +14,6 @@ version = project.projectVersion
 ext.isSnapshot = project.projectVersion.endsWith('-SNAPSHOT')
 ext.isReleaseVersion = !isSnapshot
 
-subprojects { project->
-
-    if (!project.name.contains('test')) {
-        return
-    }
-
-    configurations {
-        documentation
-    }
-
-    dependencies {
-        documentation "com.github.javaparser:javaparser-core:3.25.8"
-    }
-
-    tasks.withType(Groovydoc).configureEach {
-        it.classpath += configurations.documentation
-    }
-}
-
 if (isReleaseVersion) {
     apply plugin: 'maven-publish'
     apply plugin: "io.github.gradle-nexus.publish-plugin"
@@ -50,4 +31,4 @@ if (isReleaseVersion) {
             }
         }
     }
-}
+}

docs/build.gradle

@@ -3,10 +3,10 @@ buildscript {
         maven { url 'https://repo.grails.org/grails/core' }
     }
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
-        classpath "org.asciidoctor:asciidoctor-gradle-jvm-epub:3.3.2"
-        classpath "org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.3.2"
-        classpath "org.asciidoctor:asciidoctor-gradle-jvm-gems:3.3.2"
+        classpath 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.3'
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm-epub:4.0.3"
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm-pdf:4.0.3"
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm-gems:4.0.3"
     }
 }
 
@@ -45,7 +45,7 @@ repositories {
 }
 
 dependencies {
-    asciidoctorGems 'rubygems:rouge:3.15.0'
+    asciidoctorGems 'rubygems:rouge:4.4.0'
 }
 
 

gradle.properties

@@ -1,11 +1,13 @@
 projectVersion=6.0.0-SNAPSHOT
-grailsVersion=6.1.0
+grailsVersion=7.0.0-SNAPSHOT
 threeZeroXProjectVersion=3.0.1
-casClientCoreVersion=3.6.4
-springSecurityCoreVersion=5.3.0
-springSecurityVersion=5.8.9
-javaxServletApiVersion=4.0.1
-assetPipelineVersion=4.4.0
+casClientCoreVersion=4.0.4
+springSecurityCoreVersion=7.0.0-SNAPSHOT
+springSecurityVersion=6.3.3
+jakartaServletApiVersion=6.0.0
+assetPipelineVersion=5.0.1
+groovyVersion=4.0.22
+gormVersion=9.0.0-SNAPSHOT
 projectDesc=The CAS plugin adds CAS single sign-on support to a Grails application that uses Spring Security.
 projectUrl=https://github.com/grails/grails-spring-security-cas
 githubSlug=grails/grails-spring-security-cas

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-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

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/master/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/.
@@ -80,13 +82,12 @@ 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##*/}
-
-# 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,22 +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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +201,28 @@ 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" \
         -classpath "$CLASSPATH" \
         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.

gradlew.bat

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,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,13 +43,13 @@ 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.
-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
 
@@ -56,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
 
@@ -75,13 +78,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

plugin/build.gradle

@@ -10,15 +10,25 @@ buildscript {
 version = projectVersion
 group = 'org.grails.plugins'
 
+configurations {
+    all {
+        exclude group: 'javax.servlet'
+        exclude group: 'javax.xml.bind'
+    }
+}
+
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'org.grails.grails-plugin'
 
-sourceCompatibility = 1.11
-targetCompatibility = 1.11
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 ext."signing.keyId" = project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : System.getenv('SIGNING_KEY')
 ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg"
@@ -63,22 +73,22 @@ configurations {
 }
 
 dependencies {
-	compileOnly "javax.servlet:javax.servlet-api:$javaxServletApiVersion"
+	compileOnly "jakarta.servlet:jakarta.servlet-api:$jakartaServletApiVersion"
 	compileOnly "org.springframework.boot:spring-boot-starter-logging"
 	compileOnly "org.grails:grails-web-boot"
 
 	profile "org.grails.profiles:web-plugin"
 	api "org.grails.plugins:spring-security-core:$springSecurityCoreVersion"
 
-	api "org.jasig.cas.client:cas-client-core:$casClientCoreVersion", {
+	api "org.apereo.cas.client:cas-client-core:$casClientCoreVersion", {
 		exclude module: 'slf4j-api'
 	}
 	api "org.springframework.security:spring-security-cas:$springSecurityVersion", {
 		['spring-beans', 'spring-context', 'spring-core', 'spring-security-core',
 		 'spring-security-web', 'spring-web'].each { exclude module: it }
 	}
 
-	documentation "com.github.javaparser:javaparser-core:3.25.8"
+	documentation "com.github.javaparser:javaparser-core:3.26.2"
 }
 
 tasks.withType(Groovydoc).configureEach {