Merge pull request #1044 from grails/merge-6.1.x-into-7.0.x-12-6-2024

Merge 6.1.x into 7.0.x

.github/workflows/release.yml

@@ -3,14 +3,14 @@ on:
   release:
     types: [published]
 env:
-  GIT_USER_NAME: puneetbehl
-  GIT_USER_EMAIL: [email protected]
+  GIT_USER_NAME: 'grails-build'
+  GIT_USER_EMAIL: '[email protected]'
 jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      GIT_USER_NAME: puneetbehl
-      GIT_USER_EMAIL: [email protected]
+      GIT_USER_NAME: 'grails-build'
+      GIT_USER_EMAIL: '[email protected]'
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v2

build.gradle

@@ -14,10 +14,9 @@ if (isReleaseVersion) {
         String nexusUser = findProperty('sonatypeUsername')
         String nexusPass = findProperty('sonatypePassword')
         String nexusStagingProfileId = findProperty('sonatypeStagingProfileId')
-        String nexusUrl = findProperty('sonatypeNexusUrl') ?: 'https://s01.oss.sonatype.org/service/local/'
         repositories {
             sonatype {
-                nexusUrl = uri(nexusUrl)
+                nexusUrl = uri('https://s01.oss.sonatype.org/service/local/')
                 username = nexusUser
                 password = nexusPass
                 stagingProfileId = nexusStagingProfileId

gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
 asset-pipeline = '5.0.1'
+bytebuddy = '1.15.10'
 commons-text = '1.12.0'
 ehcache = '3.10.8'
 geb = '7.0'
@@ -27,6 +28,7 @@ tomcat = '10.1.29'
 [libraries]
 commons-text = { module = 'org.apache.commons:commons-text', version.ref = 'commons-text' }
 ehcache = { module = 'org.ehcache:ehcache', version.ref = 'ehcache' }
+bytebuddy = { module = 'net.bytebuddy:byte-buddy', version.ref = 'bytebuddy' }
 geb-core = { module = 'org.gebish:geb-core', version.ref = 'geb' }
 geb-spock = { module = 'org.gebish:geb-spock', version.ref = 'geb' }
 gorm-hibernate5 = { module = 'org.grails.plugins:hibernate5', version.ref = 'gorm-hibernate5' }

plugin/build.gradle

@@ -47,6 +47,7 @@ dependencies {
 	testImplementation libs.spring.test
 	testImplementation libs.spring.security.config
 
+	testRuntimeOnly libs.bytebuddy
 	testRuntimeOnly libs.slf4j.nop // Prevents warnings about missing slf4j implementation during tests
 }
 

plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java

@@ -1,4 +1,4 @@
-/* Copyright 2006-2016 the original author or authors.
+/* Copyright 2006-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 /**
  * Stores the default order numbers of all Spring Security filters for use in configuration.
- *
+ * <p>
  * Equivalent to <code>org.springframework.security.config.http.SecurityFilters</code> which
  * unfortunately is package-default.
  *
  * @author Burt Beckwith
  */
-enum SecurityFilterPosition  {
+public enum SecurityFilterPosition {
 
 	FIRST(Integer.MIN_VALUE),