From 65a0533750948c4c0f6bb065371acc419f8a894c Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 2 Oct 2024 11:45:37 -0400 Subject: [PATCH 1/4] fix(deps): update to org.grails.profiles:base:6.0.1 which includes grails6-wrapper:4.0.1 with the update-wrapper command (#13720) --- grails-bom/profiles.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-bom/profiles.properties b/grails-bom/profiles.properties index fb4b3278cbd..f55acd32311 100644 --- a/grails-bom/profiles.properties +++ b/grails-bom/profiles.properties @@ -1,5 +1,5 @@ rest-api=6.0.0 -base=6.0.0 +base=6.0.1 web=6.0.0 react=6.0.0 vue=6.0.0 From 6969d2e126f320e3569e43e6cc8368cd2a89a688 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 2 Oct 2024 14:18:46 -0400 Subject: [PATCH 2/4] update profiles to latest releases for Grails 6 (#13721) --- grails-bom/profiles.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/grails-bom/profiles.properties b/grails-bom/profiles.properties index f55acd32311..9d89d8e8822 100644 --- a/grails-bom/profiles.properties +++ b/grails-bom/profiles.properties @@ -1,10 +1,10 @@ -rest-api=6.0.0 +rest-api=6.0.1 base=6.0.1 -web=6.0.0 -react=6.0.0 -vue=6.0.0 -plugin=6.0.0 -profile=6.0.0 -rest-api-plugin=6.0.0 -web-plugin=6.0.0 -angular=9.0.0 \ No newline at end of file +web=6.0.1 +react=6.0.1 +vue=6.0.1 +plugin=6.0.1 +profile=6.0.1 +rest-api-plugin=6.0.1 +web-plugin=6.0.1 +angular=9.0.1 \ No newline at end of file From 7473a1acb805f5e06ce185486f8b27995538ffd6 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 3 Oct 2024 18:15:20 -0400 Subject: [PATCH 3/4] Update to new versions for Grails 6.2.1 release (#13724) --- gradle.properties | 4 ++-- grails-bom/plugins.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index cb2a8301ae5..24c1643af57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,12 +7,12 @@ cglibVersion=2.2.2 commonsLangVersion=2.6 datastoreVersion=8.1.2 directoryWatcherVersion=0.9.9 -fieldsPluginVersion=5.1.0-SNAPSHOT +fieldsPluginVersion=5.1.0 gdocEngineVersion=1.0.1 gradleNexusPluginVersion=2.3.1 gradleNexusStagingPluginVersion=0.12.0 groovyVersion=3.0.21 -gspVersion=6.2.2-SNAPSHOT +gspVersion=6.2.2 h2.version=2.2.224 h2Version=2.2.224 hibernateDatastoreVersion=8.1.0 diff --git a/grails-bom/plugins.properties b/grails-bom/plugins.properties index d2c6c2e0f88..3824af05ec0 100644 --- a/grails-bom/plugins.properties +++ b/grails-bom/plugins.properties @@ -1,11 +1,11 @@ gorm.hibernate5=8.1.0 gorm.mongodb=8.2.0 gorm.neo4j=8.1.0 -grails-gradle-plugin=6.2.0 +grails-gradle-plugin=6.2.1 cache=7.0.0 rxjava=1.1.1 rxjava2=2.0.0 -scaffolding=5.1.2-SNAPSHOT +scaffolding=5.1.2 geb=4.0.0 views-json=3.2.3 views-json-templates=3.2.3 From ed773a00fc8150b15ef7e652307ad7a715ca794e Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 3 Oct 2024 19:09:14 -0400 Subject: [PATCH 4/4] Add @Input to macros (#13726) --- .../src/main/groovy/grails/doc/gradle/PublishGuide.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy b/grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy index 2cd1bab29d2..20a68d853da 100644 --- a/grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy +++ b/grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy @@ -34,7 +34,7 @@ class PublishGuide extends DefaultTask { @Optional @InputDirectory File workDir = project.layout.buildDirectory.get().asFile @Optional @InputDirectory File resourcesDir = new File(project.projectDir, "resources") - @Optional Collection macros = [] + @Optional @Input Collection macros = [] @OutputDirectory File targetDir = project.layout.buildDirectory.dir("docs").get().asFile