Grails 7 testapps and remove testapps gradle wrappers

build.gradle

@@ -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.26.2"
-    }
-
-    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) {
             }
         }
     }
-}
+}

gradle.properties

@@ -7,6 +7,7 @@ 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

plugin/grails-app/conf/logback.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <withJansi>true</withJansi>
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+   <!--<logger name='grails.plugin.springsecurity' level='TRACE' />-->
+   <!--<logger name='org.springframework.security' level='DEBUG' />-->
+   <!--<logger name='org.hibernate.SQL' level='DEBUG' />-->
+   <!--<logger name='org.hibernate.type.descriptor.sql.BasicBinder' level='TRACE' />-->
+
+</configuration>

settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
+    id "com.gradle.enterprise" version "3.16.2"
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
 }
 
 gradleEnterprise {
@@ -28,10 +28,10 @@ include 'docs'
 include 'plugin'
 include 'testapp-spring-security-cas-test1'
 
-project(':testapp-spring-security-cas-test1').projectDir = new File(settingsDir, 'testapps/testapp-spring-security-cas-test1')
+project(':testapp-spring-security-cas-test1').projectDir = new File(settingsDir, 'testapps/spring-security-cas-test1')
 include 'testapp-spring-security-cas-test2'
 
-project(':testapp-spring-security-cas-test2').projectDir = new File(settingsDir, 'testapps/testapp-spring-security-cas-test2')
+project(':testapp-spring-security-cas-test2').projectDir = new File(settingsDir, 'testapps/spring-security-cas-test2')
 
 rootProject.name = 'spring-security-cas'
 

testapps/spring-security-cas-test1/build.gradle

@@ -19,19 +19,13 @@ apply plugin:"war"
 apply plugin:"org.grails.grails-web"
 apply plugin:"asset-pipeline"
 apply plugin:"org.grails.grails-gsp"
+apply plugin:"application"
 
 repositories {
     mavenLocal()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
-configurations {
-    developmentOnly
-    runtimeClasspath {
-        extendsFrom developmentOnly
-    }
-}
-
 configurations.configureEach {
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
         if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
@@ -42,47 +36,44 @@ configurations.configureEach {
 }
 
 dependencies {
-    developmentOnly "org.springframework.boot:spring-boot-devtools"
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core-jakarta:5.6.15.Final"
-    compile "org.grails.plugins:gsp"
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.grails:grails-core"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-tomcat"
+    implementation "org.grails:grails-web-boot"
+    implementation "org.grails:grails-logging"
+    implementation "org.grails:grails-plugin-rest"
+    implementation "org.grails:grails-plugin-databinding"
+    implementation "org.grails:grails-plugin-i18n"
+    implementation "org.grails:grails-plugin-services"
+    implementation "org.grails:grails-plugin-url-mappings"
+    implementation "org.grails:grails-plugin-interceptors"
+    implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:async"
+    implementation "org.grails.plugins:scaffolding"
+    implementation "org.grails.plugins:events"
+    implementation "org.grails.plugins:hibernate5"
+    implementation "org.hibernate:hibernate-core-jakarta:5.6.15.Final"
+    implementation "org.grails.plugins:gsp"
     console "org.grails:grails-console"
-    profile "org.grails.profiles:web"
-    runtime "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.grails:grails-web-testing-support"
-    testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:4.13.0"
-    testRuntime "org.htmlunit:htmlunit:4.4.0"
-
-    compile project(':spring-security-cas')
-}
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.grails:grails-web-testing-support"
+    testRuntimeOnly "org.seleniumhq.selenium:htmlunit-driver:4.13.0"
+    testRuntimeOnly "org.htmlunit:htmlunit:4.4.0"
 
-bootRun {
-    jvmArgs('-Dspring.output.ansi.enabled=always')
+    implementation project(':spring-security-cas')
 }
 
-
 assets {
     minifyJs = true
     minifyCss = true
-}
+}
+
+application {
+    mainClass = "spring.security.cas.test.Application"
+}