From 65a0533750948c4c0f6bb065371acc419f8a894c Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 2 Oct 2024 11:45:37 -0400 Subject: [PATCH 1/7] 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 fb4b3278cb..f55acd3231 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/7] 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 f55acd3231..9d89d8e882 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/7] 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 cb2a8301ae..24c1643af5 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 d2c6c2e0f8..3824af05ec 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/7] 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 2cd1bab29d..20a68d853d 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 From 753cbc842c756e843e1fab99e36fca85e27dc8d3 Mon Sep 17 00:00:00 2001 From: grails-build Date: Fri, 4 Oct 2024 00:00:58 +0000 Subject: [PATCH 5/7] Back to 6.2.2-SNAPSHOT --- gradle.properties | 2 +- grails-core/src/test/groovy/grails/util/GrailsUtilTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 24c1643af5..449b1d2825 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.2.1-SNAPSHOT +projectVersion=6.2.2-SNAPSHOT antVersion=1.10.14 aspectjVersion=1.9.22 asyncVersion=5.0.2 diff --git a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java index 0894f59751..ed33ba50e4 100644 --- a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java +++ b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java @@ -29,7 +29,7 @@ public class GrailsUtilTests { @Test public void testGrailsVersion() { - assertEquals("6.2.1-SNAPSHOT", GrailsUtil.getGrailsVersion()); + assertEquals("6.2.2-SNAPSHOT", GrailsUtil.getGrailsVersion()); } @AfterEach From 9ba06e337725ad7cbfe98823b226c3fd38a5745d Mon Sep 17 00:00:00 2001 From: James Fredley Date: Fri, 4 Oct 2024 09:17:41 -0400 Subject: [PATCH 6/7] Update grails-gradle-plugin=6.2.2-SNAPSHOT (#13728) --- grails-bom/plugins.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-bom/plugins.properties b/grails-bom/plugins.properties index 3824af05ec..af16065ab1 100644 --- a/grails-bom/plugins.properties +++ b/grails-bom/plugins.properties @@ -1,7 +1,7 @@ gorm.hibernate5=8.1.0 gorm.mongodb=8.2.0 gorm.neo4j=8.1.0 -grails-gradle-plugin=6.2.1 +grails-gradle-plugin=6.2.2-SNAPSHOT cache=7.0.0 rxjava=1.1.1 rxjava2=2.0.0 @@ -9,4 +9,4 @@ scaffolding=5.1.2 geb=4.0.0 views-json=3.2.3 views-json-templates=3.2.3 -views-markup=3.2.3 \ No newline at end of file +views-markup=3.2.3 From 06335f95865c2b42ba3c7338a3797dde35e400e9 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 10 Oct 2024 08:52:17 -0400 Subject: [PATCH 7/7] fix grails-bom maven group/artifact for io.micronaut.spring:micronaut-spring and org.grails:grails-gradle-plugin (#13737) --- build.gradle | 2 +- grails-bom/build.gradle | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e7777ada6e..3c6b86fc15 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ ext { 'micronautSpring' : [version: micronautSpringVersion, group : 'io.micronaut.spring', names : ['micronaut-spring'], - modules: ['spring', 'context', 'boot', 'web', 'boot-annotation', 'annotation', 'web-annotation'] + modules: ['', 'context', 'boot', 'web', 'boot-annotation', 'annotation', 'web-annotation'] ], 'mongodb' : [version: mongodbJavaDriverVersion, group : 'org.mongodb', diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle index 9c60edca29..b2774b54ef 100644 --- a/grails-bom/build.gradle +++ b/grails-bom/build.gradle @@ -92,7 +92,11 @@ publishing { artifactId = artifactId.replace("gorm.", "") } mkp.dependency { - mkp.groupId 'org.grails.plugins' + if(artifactId == 'grails-gradle-plugin') { + mkp.groupId 'org.grails' + } else { + mkp.groupId 'org.grails.plugins' + } mkp.artifactId artifactId String versionValue = plugin.value if (!isBuildSnapshot && versionValue.endsWith("-SNAPSHOT")) {