From 8c65852b30c3a38ecece48e24f7b5b305e40973c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:43:14 +0530 Subject: [PATCH 01/11] Update actions/cache action to v4 (#13367) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/groovy-joint-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 0d2561233ca..db45110b707 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -43,7 +43,7 @@ jobs: distribution: 'adopt' java-version: '11.0.6' - name: Cache local Maven repository & Groovy - uses: actions/cache@v3 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4 with: path: | ~/groovy @@ -130,7 +130,7 @@ jobs: distribution: 'adopt' java-version: '11' - name: Cache local Maven repository & Groovy - uses: actions/cache@v3 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4 with: path: | ~/groovy From 972cb93f22739eb019c39f27f60bdf8286f37fb5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:43:24 +0530 Subject: [PATCH 02/11] Update gspVersion to v6.1.3 (#13365) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6091a6d4712..6d3e53277f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ gdocEngineVersion=1.0.1 gradleNexusPluginVersion=2.3.1 gradleNexusStagingPluginVersion=0.12.0 groovyVersion=3.0.11 -gspVersion=6.1.2 +gspVersion=6.1.3 h2.version=2.2.224 h2Version=2.2.224 hibernateDatastoreVersion=8.0.2 From 856fcdeaaeb2a624feaa8e0781cee5e594c82444 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:43:33 +0530 Subject: [PATCH 03/11] Update dependency org.jsoup:jsoup to v1.17.2 (#13363) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- grails-docs/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-docs/build.gradle b/grails-docs/build.gradle index e585446cd8b..609051c518e 100644 --- a/grails-docs/build.gradle +++ b/grails-docs/build.gradle @@ -21,7 +21,7 @@ dependencies { runtimeOnly('com.lowagie:itext:2.0.8') - api 'org.jsoup:jsoup:1.17.1' + api 'org.jsoup:jsoup:1.17.2' testImplementation("org.spockframework:spock-core:${spockVersion}") { transitive = false } } From ecb16f8a3e7447f76f3e7558bcf035e3d0a08c67 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:43:47 +0530 Subject: [PATCH 04/11] Update dependency org.asciidoctor:asciidoctorj to v2.5.11 (#13361) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- grails-docs/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-docs/build.gradle b/grails-docs/build.gradle index 609051c518e..79f172a55a7 100644 --- a/grails-docs/build.gradle +++ b/grails-docs/build.gradle @@ -12,7 +12,7 @@ dependencies { 'org.yaml:snakeyaml:2.2', "org.codehaus.groovy:groovy-ant:$groovyVersion" - api 'org.asciidoctor:asciidoctorj:2.5.10' + api 'org.asciidoctor:asciidoctorj:2.5.11' api('org.xhtmlrenderer:core-renderer:8.0') { exclude group: 'bouncycastle', module:'bcprov-jdk14' } From 4ba5f37e41d8a886663f90a05a4176878028c399 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:43:58 +0530 Subject: [PATCH 05/11] Update grails-testing-support monorepo to v3.1.2 (#13364) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6d3e53277f6..03029514289 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ springLoadedVersion=1.2.8.RELEASE springVersion=5.3.31 spring.version=5.3.30 testingSupportVersion=3.1.1 -testingSupportVersionForTests=3.1.1 +testingSupportVersionForTests=3.1.2 tomcatLog4jVersion=8.5.2 tomcatVersion=9.0.84 viewsVersion=3.1.1 From 81cbe844a56450826396a12418671743ceeb8a07 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:44:09 +0530 Subject: [PATCH 06/11] Update datastoreVersion to v8.0.4 (#13360) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 03029514289..e8e03758257 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ asyncVersion=5.0.2 caffeineVersion=2.9.3 cglibVersion=2.2.2 commonsLangVersion=2.6 -datastoreVersion=8.0.3 +datastoreVersion=8.0.4 directoryWatcherVersion=0.9.9 gdocEngineVersion=1.0.1 gradleNexusPluginVersion=2.3.1 From 57fe4c87057e17532d2c57d2e822597dcd39d544 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:44:43 +0530 Subject: [PATCH 07/11] Update plugin com.gradle.enterprise to v3.16.2 (#13366) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index bd3500c886d..c1eec29fce0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.16.1" + id "com.gradle.enterprise" version "3.16.2" id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1' } From ed1c0b4e05bb3e30be8b44c2a033cd2157d91f16 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:45:25 +0530 Subject: [PATCH 08/11] Update apache-tomcat monorepo to v9.0.85 (#13359) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e8e03758257..02bcb0cf9ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,7 +45,7 @@ spring.version=5.3.30 testingSupportVersion=3.1.1 testingSupportVersionForTests=3.1.2 tomcatLog4jVersion=8.5.2 -tomcatVersion=9.0.84 +tomcatVersion=9.0.85 viewsVersion=3.1.1 org.gradle.caching=true org.gradle.parallel=true From 228500a379590d3f6b2f425adfcf4789c31ddf08 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:45:43 +0530 Subject: [PATCH 09/11] Update dependency org.grails:grails-datastore-gorm-hibernate5 to v8.0.3 (#13362) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- grails-test-suite-persistence/build.gradle | 2 +- grails-test-suite-uber/build.gradle | 2 +- grails-test-suite-web/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle index cf2988e9b14..612cea70650 100644 --- a/grails-test-suite-persistence/build.gradle +++ b/grails-test-suite-persistence/build.gradle @@ -16,7 +16,7 @@ dependencies { project(':grails-spring') testImplementation "org.grails:grails-datastore-gorm-validation:$datastoreVersion" - testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", { + testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", { exclude group: 'org.grails', module:'grails-datastore-gorm' exclude group: 'org.grails', module:'grails-datastore-core' exclude group: 'org.springframework', module:'spring-core' diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle index 330bfc21931..626571a42c6 100644 --- a/grails-test-suite-uber/build.gradle +++ b/grails-test-suite-uber/build.gradle @@ -28,7 +28,7 @@ dependencies { project(":grails-plugin-databinding"), project(':grails-spring') - testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", { + testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", { exclude group: 'org.grails', module:'grails-datastore-gorm' exclude group: 'org.grails', module:'grails-datastore-core' exclude group: 'org.springframework', module:'spring-core' diff --git a/grails-test-suite-web/build.gradle b/grails-test-suite-web/build.gradle index 8dbe6ac55f6..7f1569b8f08 100644 --- a/grails-test-suite-web/build.gradle +++ b/grails-test-suite-web/build.gradle @@ -29,7 +29,7 @@ dependencies { project(':grails-spring') testImplementation "org.grails.plugins:converters:$legacyConvertersVersion" - testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", { + testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", { exclude group: 'org.grails', module:'grails-datastore-gorm' exclude group: 'org.grails', module:'grails-datastore-core' exclude group: 'org.springframework', module:'spring-core' From a58ae33d1cba75a13a88e4d285f5dac8384fb55f Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 26 Jan 2024 22:08:17 +0100 Subject: [PATCH 10/11] fix: Groovy 3.0.20 compatibility (#13371) --- grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy | 3 ++- .../main/groovy/org/grails/cli/profile/AbstractProfile.groovy | 4 ++-- .../converters/AbstractStructuredBindingEditor.groovy | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy b/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy index 62df78c0740..dfa9874ab2a 100644 --- a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy +++ b/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy @@ -27,6 +27,7 @@ import groovy.transform.CompileStatic import jline.UnixTerminal import jline.console.UserInterruptException import jline.console.completer.ArgumentCompleter +import jline.console.completer.Completer import jline.internal.NonBlockingInputStream import org.gradle.tooling.BuildActionExecuter import org.gradle.tooling.BuildCancelledException @@ -417,7 +418,7 @@ class GrailsCli { new RegexCompletor("!\\w+"), new EscapingFileNameCompletor()) ) - completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection) + completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection) consoleReader.addCompleter(aggregateCompleter) return console } diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy b/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy index 20fbd13a23d..0644bbf6f0b 100644 --- a/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy +++ b/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy @@ -166,8 +166,8 @@ abstract class AbstractProfile implements Profile { } } - defaultFeaturesNames.addAll(defaultFeatures) - requiredFeatureNames.addAll(requiredFeatures) + defaultFeaturesNames.addAll(defaultFeatures as Set) + requiredFeatureNames.addAll(requiredFeatures as Set) } diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy b/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy index d52f65e3a20..b7fc8a885dd 100644 --- a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy +++ b/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy @@ -73,6 +73,6 @@ abstract class AbstractStructuredBindingEditor implements TypedStructuredBind valuesMap[propName] = bindingSource.getPropertyValue(key) } } - valuesMap + valuesMap as Map } } From 4799a592408d26c49d9a23f2153b700c9fbbfda0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 21:09:37 +0000 Subject: [PATCH 11/11] fix(deps): update dependency com.github.ben-manes.caffeine:caffeine to v3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 02bcb0cf9ca..2d021e34dcb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ projectVersion=6.1.2-SNAPSHOT antVersion=1.10.14 aspectjVersion=1.9.21 asyncVersion=5.0.2 -caffeineVersion=2.9.3 +caffeineVersion=3.1.8 cglibVersion=2.2.2 commonsLangVersion=2.6 datastoreVersion=8.0.4