From 46411bda8b0069535679b032ca8a4835f60a90b5 Mon Sep 17 00:00:00 2001 From: Brian Koehmstedt <1261658+bkoehm@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:17:13 -0700 Subject: [PATCH 1/4] Grails 7: grails-spring-security-acl --- build.gradle | 11 + docs/build.gradle | 6 +- docs/src/docs/code/grails-app/views/error.gsp | 4 +- functional-test-app/build.gradle | 81 +++-- .../grails-app/conf/logback.groovy | 37 --- .../grails-app/conf/logback.xml | 21 ++ .../grails-app/views/error.gsp | 4 +- gradle.properties | 17 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 310 ++++++++++++------ gradlew.bat | 88 ++--- integration-test-app/build.gradle | 59 ++-- .../grails-app/conf/logback.groovy | 36 -- .../grails-app/conf/logback.xml | 19 ++ plugin/build.gradle | 70 ++-- .../ProxyAwareParameterNameDiscoverer.groovy | 4 +- .../acl/SpringSecurityAclGrailsPlugin.groovy | 21 +- .../cache/SpringAclCacheFactoryBean.groovy | 68 ++++ 19 files changed, 502 insertions(+), 358 deletions(-) create mode 100644 build.gradle delete mode 100644 functional-test-app/grails-app/conf/logback.groovy create mode 100644 functional-test-app/grails-app/conf/logback.xml delete mode 100644 integration-test-app/grails-app/conf/logback.groovy create mode 100644 integration-test-app/grails-app/conf/logback.xml create mode 100644 plugin/src/main/groovy/grails/plugin/springsecurity/acl/cache/SpringAclCacheFactoryBean.groovy diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..92fc468 --- /dev/null +++ b/build.gradle @@ -0,0 +1,11 @@ +subprojects { + configurations.configureEach { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') { + String groovyVersion = findProperty('groovyVersion') ?: libs.versions.groovy.get() + details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion) + details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version" + } + } + } +} diff --git a/docs/build.gradle b/docs/build.gradle index 24e2aaa..c8ac3e7 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -3,9 +3,9 @@ buildscript { maven { url 'https://repo.grails.org/grails/core' } } dependencies { - classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' - classpath 'org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.6' - classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11' + classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1' + classpath 'org.asciidoctor:asciidoctorj-epub3:2.1.3' + classpath 'org.asciidoctor:asciidoctorj-pdf:2.3.18' } } diff --git a/docs/src/docs/code/grails-app/views/error.gsp b/docs/src/docs/code/grails-app/views/error.gsp index 9a3bb8a..a2c4235 100644 --- a/docs/src/docs/code/grails-app/views/error.gsp +++ b/docs/src/docs/code/grails-app/views/error.gsp @@ -10,8 +10,8 @@ - - + +