Merge pull request #1144 from matrei/sitemesh2revert

Revert to Sitemesh 2

Author: jdaugherty

buildSrc/build.gradle

@@ -57,16 +57,18 @@ dependencies {
     implementation "org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:${versions.get('ratVersion')}"
     implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${versions.get('gradleCryptoChecksumVersion')}"
 
-    testImplementation 'org.spockframework:spock-core'
+    testImplementation 'org.spockframework:spock-core', {
+        exclude(group: 'org.codehaus.groovy') // Use Gradle provided version because: Could not resolve org.codehaus.groovy:groovy:3.0.12
+    }
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher', {
+        // In Gradle 9, this needs to be declared
+        // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
+    }
 }
 
 tasks.withType(Test).configureEach {
     onlyIf {
-        ![
-                'skipTests'
-        ].find {
-            project.hasProperty(it)
-        }
+        !project.hasProperty('skipTests')
     }
 
     useJUnitPlatform()

gradle.properties

@@ -17,12 +17,9 @@
 #  under the License.
 #
 projectVersion=7.0.0-SNAPSHOT
-grailsVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-M5
 javaVersion=17
 
-# TODO: This is a work around since the bom does not support exclusions and spring forces groovy version 4.0.26
-groovy.version=4.0.27
-
 unboundidLdapSdk=7.0.2
 apacheDsVersion=1.5.4
 asciidoctorGradlePluginVersion=4.0.4

gradle/plugin-config.gradle

@@ -17,11 +17,13 @@
  *  under the License.
  */
 
+import org.grails.gradle.plugin.core.GrailsExtension
+
 // The plugins do not have an Application class and are not runnable by themselves
 tasks.named('bootRun') { enabled = false }
 tasks.named('findMainClass') { enabled = false }
 
-grails {
-    // turn off dependency management so we *know* we're testing with the right versions and not from a remote repository
-    springDependencyManagement = false
+extensions.configure(GrailsExtension) {
+    // Explicit `it` is required in extension configuration blocks
+    it.springDependencyManagement = false
 }

gradle/test-config.gradle

@@ -17,6 +17,8 @@
  *  under the License.
  */
 
+import org.grails.gradle.plugin.core.GrailsExtension
+
 dependencies {
     // In Gradle 9, this needs to be declared
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
@@ -25,11 +27,7 @@ dependencies {
 
 tasks.withType(Test).configureEach {
     onlyIf {
-        ![
-                'skipTests'
-        ].find {
-            project.hasProperty(it)
-        }
+        !project.hasProperty('skipTests')
     }
 
     useJUnitPlatform()
@@ -42,20 +40,27 @@ tasks.withType(Test).configureEach {
 
 tasks.named('integrationTest', Test) {
     onlyIf {
-        ![
-                'skipTests'
-        ].find {
-            project.hasProperty(it)
-        }
+        !project.hasProperty('skipTests')
     }
 
-    systemProperty 'geb.build.reportsDir', reporting.file("$project.projectDir/build/geb-reports")
-    systemProperties System.properties
+    systemProperty('geb.build.reportsDir', reporting.file("$projectDir/build/geb-reports"))
+    systemProperty('grails.geb.reporting.directory', reporting.file("$projectDir/build/geb-reports").canonicalFile.absolutePath)
+    // systemProperty('grails.geb.recording.mode', 'RECORD_ALL')
+    systemProperties(System.properties)
+
     doFirst {
         logger.quiet(
                 '\n - Running tests for configuration: {} and Grails: {}',
                 System.getProperty('TESTCONFIG', 'N/S'),
                 grailsVersion
         )
     }
+}
+
+extensions.configure(GrailsExtension) {
+    // Explicit `it` is required in extension configuration blocks
+
+    // turn off dependency management so we *know* we're testing with the right
+    // versions and not from a remote repository
+    it.springDependencyManagement = false
 }

plugin-acl/examples/functional-test-app/src/integration-test/groovy/pages/LoginPage.groovy

@@ -25,7 +25,7 @@ class LoginPage extends Page {
 
 	static url = 'login/auth'
 
-	static at = { waitFor { title == 'Login' } }
+	static at = { title == 'Login' }
 
 	static content = {
 		loginForm { $('form') }

plugin-core/examples/functional-test-app/src/integration-test/groovy/pages/LoginPage.groovy

@@ -25,7 +25,7 @@ class LoginPage extends Page {
 
 	static url = 'login/auth'
 
-	static at = { waitFor { title == 'Login' } }
+	static at = { title == 'Login' }
 
 	static content = {
 		loginForm { $('form') }

plugin-core/examples/integration-test-app/build.gradle

@@ -46,9 +46,6 @@ dependencies {
     integrationTestImplementation 'org.apache.grails:grails-testing-support-web', {
         // @Integration
     }
-    integrationTestImplementation 'org.sitemesh:sitemesh', {
-        // SiteMeshFilter
-    }
     integrationTestImplementation 'org.springframework:spring-test', {
         // MockFilterChain, MockHttpServletRequest, MockHttpServletResponse
     }

plugin-core/examples/integration-test-app/src/integration-test/groovy/grails/plugin/springsecurity/SpringSecurityUtilsIntegrationSpec.groovy

@@ -18,7 +18,6 @@
  */
 package grails.plugin.springsecurity
 
-import org.sitemesh.webapp.SiteMeshFilter
 import org.springframework.web.filter.FormContentFilter
 
 import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE
@@ -90,7 +89,7 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         def map = SpringSecurityUtils.configuredOrderedFilters
 
         expect:
-        11 == map.size()
+        10 == map.size()
         map[Integer.MIN_VALUE + 10] instanceof SecurityRequestHolderFilter
         map[SecurityFilterPosition.SECURITY_CONTEXT_FILTER.order] instanceof SecurityContextPersistenceFilter
         map[SecurityFilterPosition.LOGOUT_FILTER.order] instanceof MutableLogoutFilter
@@ -99,7 +98,6 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         map[SecurityFilterPosition.REMEMBER_ME_FILTER.order] instanceof GrailsRememberMeAuthenticationFilter
         map[SecurityFilterPosition.ANONYMOUS_FILTER.order] instanceof GrailsAnonymousAuthenticationFilter
         map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order-10] instanceof FormContentFilter
-        map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order-4] instanceof SiteMeshFilter
         map[SecurityFilterPosition.EXCEPTION_TRANSLATION_FILTER.order] instanceof ExceptionTranslationFilter
         map[SecurityFilterPosition.FILTER_SECURITY_INTERCEPTOR.order] instanceof FilterSecurityInterceptor
 
@@ -128,7 +126,7 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         SpringSecurityUtils.clientRegisterFilter 'dummyFilter', SecurityFilterPosition.LOGOUT_FILTER.order + 10
 
         then:
-        12 == map.size()
+        11 == map.size()
         map[SecurityFilterPosition.LOGOUT_FILTER.order + 10] instanceof DummyFilter
 
         when:
@@ -144,9 +142,8 @@ class SpringSecurityUtilsIntegrationSpec extends AbstractIntegrationSpec {
         filters[6] instanceof GrailsRememberMeAuthenticationFilter
         filters[7] instanceof GrailsAnonymousAuthenticationFilter
         filters[8] instanceof FormContentFilter
-        filters[9] instanceof SiteMeshFilter
-        filters[10] instanceof ExceptionTranslationFilter
-        filters[11] instanceof FilterSecurityInterceptor
+        filters[9] instanceof ExceptionTranslationFilter
+        filters[10] instanceof FilterSecurityInterceptor
     }
 
     void 'reauthenticate'() {

plugin-core/examples/misc-functional-test-app/grails-spring-security-group/src/integration-test/groovy/demo/LoginPage.groovy

@@ -24,7 +24,7 @@ import geb.Page
 class LoginPage extends Page {
     static url = "login/auth"
 
-    static at = { waitFor { title == 'Login' } }
+    static at = { title == 'Login' }
 
     static content = {
         loginButton { $("#submit", 0) }

plugin-core/examples/misc-functional-test-app/grails-spring-security-hierarchical-roles/src/integration-test/groovy/demo/LoginPage.groovy

@@ -24,7 +24,7 @@ import geb.Page
 class LoginPage extends Page {
     static url = "login/auth"
 
-    static at = { waitFor { title == 'Login' } }
+    static at = { title == 'Login' }
 
     static content = {
         loginButton { $("#submit", 0) }