Groovy 3.0.19 compatibility (#982)

* Upgrade to Groovy 3.0.19 * Upgrade to Grails 6.1.1 * Remove explicit gorm.version declaration * Add ability to resolve Groovy Snapshot versions * Make compatible with H2 2.2.224 * Make project compatible with Groovy 3.0.19 * Revert to Groovy 3.0.11 * Another compatibility fix for H2 2.2.224 * Templates compatible with Groovy 3.0.19 * Templates compatible with H2 2.2.224 * Templates using updated way to retrieve config values --------- Co-authored-by: Puneet Behl <[email protected]>
grails · Dec 14, 2023 · f2bb17f · f2bb17f
1 parent f1d0d20
commit f2bb17f
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 15 deletions.
diff --git a/examples/functional-test-app/build.gradle b/examples/functional-test-app/build.gradle
@@ -16,6 +16,12 @@ group "grails_4_0"
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
+    if(groovyVersion?.endsWith('-SNAPSHOT')) {
+        maven {
+            name 'JFrog Groovy snapshot repo'
+            url 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
+        }
+    }
 }
 
 configurations {

diff --git a/examples/functional-test-app/grails-app/domain/com/testapp/TestUserTestRole.groovy b/examples/functional-test-app/grails-app/domain/com/testapp/TestUserTestRole.groovy
@@ -42,7 +42,7 @@ class TestUserTestRole implements Serializable {
 		criteriaFor(testUserId, testRoleId).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long testUserId, long testRoleId) {
+	private static DetachedCriteria<TestUserTestRole> criteriaFor(long testUserId, long testRoleId) {
 		TestUserTestRole.where {
 			testUser == TestUser.load(testUserId) &&
 			testRole == TestRole.load(testRoleId)

diff --git a/examples/integration-test-app/build.gradle b/examples/integration-test-app/build.gradle
@@ -14,6 +14,12 @@ group "misc.integration.test.app"
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
+    if(groovyVersion?.endsWith('-SNAPSHOT')) {
+        maven {
+            name 'JFrog Groovy snapshot repo'
+            url 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
+        }
+    }
 }
 
 dependencies {

diff --git a/examples/misc-functional-test-app/grails-spring-security-group/build.gradle b/examples/misc-functional-test-app/grails-spring-security-group/build.gradle
@@ -15,6 +15,12 @@ group "grails.spring.security.group"
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
+    if(groovyVersion?.endsWith('-SNAPSHOT')) {
+        maven {
+            name 'JFrog Groovy snapshot repo'
+            url 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
+        }
+    }
 }
 
 configurations {

diff --git a/...ctional-test-app/grails-spring-security-group/grails-app/domain/demo/RoleGroupRole.groovy b/...ctional-test-app/grails-spring-security-group/grails-app/domain/demo/RoleGroupRole.groovy
@@ -42,7 +42,7 @@ class RoleGroupRole implements Serializable {
 		criteriaFor(roleGroupId, roleId).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long roleGroupId, long roleId) {
+	private static DetachedCriteria<RoleGroupRole> criteriaFor(long roleGroupId, long roleId) {
 		RoleGroupRole.where {
 			roleGroup == RoleGroup.load(roleGroupId) &&
 			role == Role.load(roleId)

diff --git a/.../misc-functional-test-app/grails-spring-security-group/grails-app/domain/demo/User.groovy b/.../misc-functional-test-app/grails-spring-security-group/grails-app/domain/demo/User.groovy
@@ -28,6 +28,7 @@ class User implements Serializable {
     }
 
     static mapping = {
+        table name: '`user`'
 	    password column: '`password`'
     }
 }
diff --git a/...c-functional-test-app/grails-spring-security-group/grails-app/domain/demo/UserRole.groovy b/...c-functional-test-app/grails-spring-security-group/grails-app/domain/demo/UserRole.groovy
@@ -42,7 +42,7 @@ class UserRole implements Serializable {
 		criteriaFor(userId, roleId).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long userId, long roleId) {
+	private static DetachedCriteria<UserRole> criteriaFor(long userId, long roleId) {
 		UserRole.where {
 			user == User.load(userId) &&
 			role == Role.load(roleId)

diff --git a/...ctional-test-app/grails-spring-security-group/grails-app/domain/demo/UserRoleGroup.groovy b/...ctional-test-app/grails-spring-security-group/grails-app/domain/demo/UserRoleGroup.groovy
@@ -41,7 +41,7 @@ class UserRoleGroup implements Serializable {
 		criteriaFor(userId, roleGroupId).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long userId, long roleGroupId) {
+	private static DetachedCriteria<UserRoleGroup> criteriaFor(long userId, long roleGroupId) {
 		UserRoleGroup.where {
 			user == User.load(userId) &&
 			roleGroup == RoleGroup.load(roleGroupId)

diff --git a/examples/misc-functional-test-app/grails-spring-security-hierarchical-roles/build.gradle b/examples/misc-functional-test-app/grails-spring-security-hierarchical-roles/build.gradle
@@ -26,6 +26,12 @@ configurations {
 repositories {
     mavenLocal()
     maven { url "https://repo.grails.org/grails/core" }
+    if(groovyVersion?.endsWith('-SNAPSHOT')) {
+        maven {
+            name 'JFrog Groovy snapshot repo'
+            url 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
+        }
+    }
 }
 
 dependencies {

diff --git a/...nal-test-app/grails-spring-security-hierarchical-roles/grails-app/domain/demo/User.groovy b/...nal-test-app/grails-spring-security-hierarchical-roles/grails-app/domain/demo/User.groovy
@@ -28,6 +28,7 @@ class User implements Serializable {
     }
 
     static mapping = {
+        table name: '`user`'
 	    password column: '`password`'
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,6 @@ projectVersion=6.1.1-SNAPSHOT
 grailsVersion=6.1.1
 grailsGradlePluginVersion=6.1.1
 groovyVersion=3.0.11
-gorm.version=8.0.0
 vcsUrl=https://github.com/grails-plugins/grails-spring-security-core
 websiteUrl=https://github.com/grails-plugins/grails-spring-security-core
 issueTrackerUrl=https://github.com/grails-plugins/grails-spring-security-core/issues

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -66,6 +66,12 @@ jar {
 repositories {
 	mavenCentral()
 	maven { url 'https://repo.grails.org/grails/core' }
+	if(groovyVersion?.endsWith('-SNAPSHOT')) {
+		maven {
+			name 'JFrog Groovy snapshot repo'
+			url 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
+		}
+	}
 }
 
 dependencyManagement {

diff --git a/plugin/src/main/groovy/grails/plugin/springsecurity/SpringSecurityUtils.groovy b/plugin/src/main/groovy/grails/plugin/springsecurity/SpringSecurityUtils.groovy
@@ -443,7 +443,7 @@ final class SpringSecurityUtils {
 				continue
 			}
 
-			List<Filter> filters = [] + filterChain.filters // copy
+			List<Filter> filters = filterChain.filters.collect() // copy
 			int index = 0
 			while (index < filters.size() && filterToPosition[filters[index]] < order) {
 				index++

diff --git a/plugin/src/main/groovy/grails/plugin/springsecurity/web/GrailsSecurityFilterChain.groovy b/plugin/src/main/groovy/grails/plugin/springsecurity/web/GrailsSecurityFilterChain.groovy
@@ -37,7 +37,7 @@ class GrailsSecurityFilterChain implements SecurityFilterChain {
 	final String matcherPattern
 
 	GrailsSecurityFilterChain(String matcherPattern, List<Filter> filters) {
-		this.filters = [] + filters
+		this.filters = filters.collect() // copy
 		this.matcherPattern = matcherPattern
 		requestMatcher = new AntPathRequestMatcher(matcherPattern, null, false)
 		log.info 'Creating filter chain: {}, {}', requestMatcher, filters

diff --git a/plugin/src/main/templates/AuthorityGroupAuthority.groovy.template b/plugin/src/main/templates/AuthorityGroupAuthority.groovy.template
@@ -42,7 +42,7 @@ class ${groupClassName}${roleClassName} implements Serializable {
 		criteriaFor(${groupClassProperty}Id, ${roleClassProperty}Id).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long ${groupClassProperty}Id, long ${roleClassProperty}Id) {
+	private static DetachedCriteria<${groupClassName}${roleClassName}> criteriaFor(long ${groupClassProperty}Id, long ${roleClassProperty}Id) {
 		${groupClassName}${roleClassName}.where {
 			${groupClassProperty} == ${groupClassName}.load(${groupClassProperty}Id) &&
 			${roleClassProperty} == ${roleClassName}.load(${roleClassProperty}Id)

diff --git a/plugin/src/main/templates/Person.groovy.template b/plugin/src/main/templates/Person.groovy.template
@@ -47,6 +47,7 @@ class ${userClassName} implements Serializable {
 	}
 
 	static mapping = {
+	    ${'User' == userClassName ? "table name: '`user`'" : ''}
 		password column: '`password`'
 	}
 }
diff --git a/plugin/src/main/templates/PersonAuthority.groovy.template b/plugin/src/main/templates/PersonAuthority.groovy.template
@@ -42,7 +42,7 @@ class ${userClassName}${roleClassName} implements Serializable {
 		criteriaFor(${userClassProperty}Id, ${roleClassProperty}Id).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long ${userClassProperty}Id, long ${roleClassProperty}Id) {
+	private static DetachedCriteria<${userClassName}${roleClassName}> criteriaFor(long ${userClassProperty}Id, long ${roleClassProperty}Id) {
 		${userClassName}${roleClassName}.where {
 			${userClassProperty} == ${userClassName}.load(${userClassProperty}Id) &&
 			${roleClassProperty} == ${roleClassName}.load(${roleClassProperty}Id)

diff --git a/plugin/src/main/templates/PersonAuthorityGroup.groovy.template b/plugin/src/main/templates/PersonAuthorityGroup.groovy.template
@@ -41,7 +41,7 @@ class ${userClassName}${groupClassName} implements Serializable {
 		criteriaFor(${userClassProperty}Id, ${groupClassProperty}Id).count()
 	}
 
-	private static DetachedCriteria criteriaFor(long ${userClassProperty}Id, long ${groupClassProperty}Id) {
+	private static DetachedCriteria<${userClassName}${groupClassName}> criteriaFor(long ${userClassProperty}Id, long ${groupClassProperty}Id) {
 		${userClassName}${groupClassName}.where {
 			${userClassProperty} == ${userClassName}.load(${userClassProperty}Id) &&
 			${groupClassProperty} == ${groupClassName}.load(${groupClassProperty}Id)

diff --git a/plugin/src/main/templates/PersonPasswordEncoderListenerWithSalt.groovy.template b/plugin/src/main/templates/PersonPasswordEncoderListenerWithSalt.groovy.template
@@ -21,8 +21,8 @@ class ${userClassName}PasswordEncoderListener {
 
     @PostConstruct
     void setup() {
-        algorithm = springSecurityService.grailsApplication.config.get('grails.plugin.springsecurity.password.algorithm')
-        reflectionSaltProperty = springSecurityService.grailsApplication.config.get('grails.plugin.springsecurity.dao.reflectionSaltSourceProperty')
+        algorithm = springSecurityService.grailsApplication.config.getProperty('grails.plugin.springsecurity.password.algorithm')
+        reflectionSaltProperty = springSecurityService.grailsApplication.config.getProperty('grails.plugin.springsecurity.dao.reflectionSaltSourceProperty')
     }
 
     @Listener(${userClassName})

diff --git a/plugin/src/main/templates/PersonWithSalt.groovy.template b/plugin/src/main/templates/PersonWithSalt.groovy.template
@@ -45,12 +45,12 @@ class ${userClassName} implements Serializable {
 		if ( !springSecurityService ) {
 			return null
 		}
-		def algorithm = springSecurityService.grailsApplication.config.grails.plugin.springsecurity.password.algorithm
+		def algorithm = springSecurityService.grailsApplication.config.getProperty('grails.plugin.springsecurity.password.algorithm')
 		if ( algorithm == 'bcrypt' || algorithm == 'pbkdf2' ) {
 			return null
 		}
 
-		def reflectionSaltProperty = springSecurityService.grailsApplication.config.grails.plugin.springsecurity.dao.reflectionSaltSourceProperty
+		def reflectionSaltProperty = springSecurityService.grailsApplication.config.getProperty('grails.plugin.springsecurity.dao.reflectionSaltSourceProperty')
 		if ( reflectionSaltProperty ) {
 			return getProperty(reflectionSaltProperty)
 		}
@@ -65,6 +65,7 @@ class ${userClassName} implements Serializable {
 	}
 
 	static mapping = {
+	    ${'User' == userClassName ? "table name: '`user`'" : ''}
 		password column: '`password`'
 	}
 }
diff --git a/plugin/src/main/templates/PersonWithoutInjection.groovy.template b/plugin/src/main/templates/PersonWithoutInjection.groovy.template
@@ -28,6 +28,7 @@ class ${userClassName} implements Serializable {
     }
 
     static mapping = {
-	    password column: '`password`'
+        ${'User' == userClassName ? "table name: '`user`'" : ''}
+        password column: '`password`'
     }
 }