This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/grails-spring-security.git
commit c7c86db36962ecfc24e67259fcaa4dbe095a23f6 Merge: 9a63a8e2 5815ce28 Author: James Daugherty <[email protected]> AuthorDate: Wed Jul 23 18:28:40 2025 -0400 Merge pull request #1144 from matrei/sitemesh2revert Revert to Sitemesh 2 buildSrc/build.gradle | 14 ++- gradle.properties | 5 +- gradle/plugin-config.gradle | 8 +- gradle/test-config.gradle | 29 +++-- .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../examples/integration-test-app/build.gradle | 3 - .../SpringSecurityUtilsIntegrationSpec.groovy | 11 +- .../integration-test/groovy/demo/LoginPage.groovy | 2 +- .../integration-test/groovy/demo/LoginPage.groovy | 2 +- .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../examples/retrieve-db-roles/build.gradle | 3 + .../grails-app/conf/application.groovy | 7 +- .../grails-app/init/com/test/Application.groovy | 121 +++++++++++++++++++++ .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../integration-test/groovy/pages/LoginPage.groovy | 2 +- .../extended/grails-app/views/layouts/register.gsp | 1 - .../grails-app/views/layouts/springSecurityUI.gsp | 1 - .../groovy/page/aclSid/AclSidCreatePage.groovy | 2 +- .../groovy/page/aclSid/AclSidEditPage.groovy | 2 +- .../groovy/page/aclSid/AclSidSearchPage.groovy | 2 +- .../groovy/page/register/ForgotPasswordPage.groovy | 2 +- .../page/register/SecurityQuestionsPage.groovy | 2 +- .../RegistrationCodeSearchPage.groovy | 2 +- .../page/requestmap/RequestmapSearchPage.groovy | 2 +- .../groovy/page/role/RoleSearchPage.groovy | 2 +- .../groovy/page/user/UserSearchPage.groovy | 2 +- plugin-ui/examples/simple/build.gradle | 2 + .../simple/grails-app/views/layouts/register.gsp | 1 - .../grails-app/views/layouts/springSecurityUI.gsp | 1 - .../integration-test/groovy/page/CreatePage.groovy | 2 +- .../integration-test/groovy/page/EditPage.groovy | 2 +- .../integration-test/groovy/page/SearchPage.groovy | 2 +- .../groovy/page/aclClass/AclClassCreatePage.groovy | 2 +- .../groovy/page/aclClass/AclClassEditPage.groovy | 2 +- .../groovy/page/aclClass/AclClassSearchPage.groovy | 2 +- .../groovy/page/aclEntry/AclEntryCreatePage.groovy | 2 +- .../groovy/page/aclEntry/AclEntryEditPage.groovy | 2 +- .../groovy/page/aclEntry/AclEntrySearchPage.groovy | 2 +- .../AclObjectIdentityCreatePage.groovy | 2 +- .../AclObjectIdentityEditPage.groovy | 2 +- .../AclObjectIdentitySearchPage.groovy | 2 +- .../groovy/page/aclSid/AclSidCreatePage.groovy | 2 +- .../groovy/page/aclSid/AclSidEditPage.groovy | 2 +- .../groovy/page/aclSid/AclSidSearchPage.groovy | 2 +- .../PersistentLoginSearchPage.groovy | 2 +- .../groovy/page/register/ForgotPasswordPage.groovy | 2 +- .../groovy/page/register/ResetPasswordPage.groovy | 2 +- .../RegistrationCodeEditPage.groovy | 2 +- .../RegistrationCodeSearchPage.groovy | 2 +- .../page/requestmap/RequestmapCreatePage.groovy | 2 +- .../page/requestmap/RequestmapEditPage.groovy | 2 +- .../page/requestmap/RequestmapSearchPage.groovy | 2 +- .../groovy/page/role/RoleCreatePage.groovy | 2 +- .../groovy/page/role/RoleEditPage.groovy | 2 +- .../groovy/page/role/RoleSearchPage.groovy | 2 +- .../groovy/page/user/UserCreatePage.groovy | 2 +- .../groovy/page/user/UserEditPage.groovy | 2 +- .../groovy/page/user/UserSearchPage.groovy | 2 +- plugin-ui/plugin/build.gradle | 1 + .../plugin/grails-app/views/layouts/register.gsp | 1 - .../grails-app/views/layouts/springSecurityUI.gsp | 1 - settings.gradle | 12 +- 64 files changed, 217 insertions(+), 97 deletions(-)
