7.0 Cleanup

build.gradle

@@ -24,11 +24,6 @@ repositories {
 
 configurations {
     all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details->
-            if (details.requested.group == 'org.seleniumhq.selenium') {
-                details.useVersion('4.19.1')
-            }
-        }
         exclude group: 'io.micronaut', module:'micronaut-inject-groovy'
 
         resolutionStrategy.dependencySubstitution {
@@ -53,31 +48,19 @@ dependencies {
 // for testing purposes
 //    implementation files('lib/sitemesh-3.1.0-SNAPSHOT.jar', 'lib/spring-boot-starter-sitemesh-3.1.0-SNAPSHOT-plain.jar')
     api('org.sitemesh:spring-boot-starter-sitemesh:3.2.1')
-
     runtimeOnly("org.grails:grails-core")
     runtimeOnly("org.grails:grails-logging")
     implementation("org.grails:grails-plugin-databinding")
     implementation("org.grails:grails-plugin-i18n")
-    implementation("org.grails:grails-plugin-interceptors") {
-        exclude group:'org.grails.plugins', module:'sitemesh2'
-        exclude group:'org.grails', module:'grails-web-sitemesh'
-    }
-    implementation("org.grails:grails-plugin-rest") {
-        exclude group:'org.grails', module:'grails-web-sitemesh'
-    }
+    implementation("org.grails:grails-plugin-interceptors")
+    implementation("org.grails:grails-plugin-rest")
     implementation("org.grails:grails-plugin-services")
-    implementation("org.grails:grails-plugin-url-mappings") {
-        exclude group:'org.grails', module:'grails-web-sitemesh'
-    }
+    implementation("org.grails:grails-plugin-url-mappings")
     implementation("org.grails:grails-web-boot")
-    implementation("org.grails.plugins:gsp:${grailsGspVersion}") {
-        exclude group:'org.grails.plugins', module:'sitemesh2'
-        exclude group:'org.grails', module:'grails-web-sitemesh'
-    }
+    implementation("org.grails.plugins:gsp")
     runtimeOnly("org.grails.plugins:hibernate5")
-    runtimeOnly("org.grails.plugins:scaffolding") {
-        exclude group:'org.grails.plugins', module:'sitemesh2'
-        exclude group:'org.grails', module:'grails-web-sitemesh'
+    runtimeOnly("org.grails.plugins:scaffolding:6.0.0-SNAPSHOT") {
+        transitive = false // until fields plugin is published
     }
     runtimeOnly("org.springframework.boot:spring-boot-autoconfigure")
     runtimeOnly("org.springframework.boot:spring-boot-starter-actuator")
@@ -86,20 +69,23 @@ dependencies {
     runtimeOnly("org.springframework.boot:spring-boot-starter-validation")
     compileOnly("io.micronaut:micronaut-inject-groovy")
     console("org.grails:grails-console")
-    runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails:5.0.0")
+    runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails:5.0.1")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("org.apache.tomcat:tomcat-jdbc")
     runtimeOnly("org.fusesource.jansi:jansi:1.18")
 
-    runtimeOnly "javax.servlet:jstl:1.2"
-    runtimeOnly 'org.apache.tomcat.embed:tomcat-embed-jasper' // jsp example
+    runtimeOnly "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0"
+    runtimeOnly "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
+    runtimeOnly 'org.apache.tomcat.embed:tomcat-embed-jasper:10.1.0' // jsp example
 
     api ("org.grails:grails-web-gsp-taglib:${grailsGspVersion}") {
         exclude group: 'io.micronaut', module : 'micronaut-aop'
         exclude group: 'io.micronaut', module : 'micronaut-runtime'
         exclude group: 'io.micronaut.spring'
         exclude group: 'io.micronaut.cache'
     }
+
+//    implementation 'org.graalvm.sdk:graal-sdk:22.0.0.2'
 }
 
 application {
@@ -144,7 +130,6 @@ tasks.withType(GenerateModuleMetadata) {
 }
 
 group = "org.sitemesh"
-version "7.0.0-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.toVersion("17")
@@ -210,4 +195,9 @@ nexusPublishing {
     repositories {
         sonatype()
     }
-}
+}
+
+bootRun {
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
+}

buildSrc/build.gradle

@@ -3,7 +3,7 @@ repositories {
     maven { url "https://repo.grails.org/grails/core/" }
 }
 dependencies {
-    implementation("com.bertramlabs.plugins:asset-pipeline-gradle:5.0.0")
+    implementation("com.bertramlabs.plugins:asset-pipeline-gradle:5.0.1")
     implementation("org.grails:grails-gradle-plugin:7.0.0-SNAPSHOT")
     implementation("org.grails.plugins:hibernate5:9.0.0-SNAPSHOT")
 }

gradle.properties

@@ -1,3 +1,4 @@
+version=1.0.0
 grailsVersion=7.0.0-SNAPSHOT
 grailsGspVersion=7.0.0-SNAPSHOT
 grailsGradlePluginVersion=7.0.0-SNAPSHOT

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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-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.