Merge branch '7.0.x' into renovate/jackson.version

Author: codeconsole

CONTRIBUTING.md

@@ -0,0 +1,29 @@
+# Common 7.0 Upgrade Gotchas - DRAFT -
+
+Experienced while upgrading modules for Grails 7
+
+- h2 2.x is stricter about reserved words
+  - https://github.com/grails/gorm-hibernate5/pull/910/commits/c8de45df204966ccc228b46b94beeb2142ae0f59 
+- [GROOVY-10621](https://issues.apache.org/jira/browse/GROOVY-10621) 
+  - Primitive booleans will no longer generate the form of isProperty & getProperty.  They will only generate isProperty()
+- Jar artifacts produced by Grails Plugins will no longer have the suffix `-plain`
+  - https://github.com/grails/grails-gradle-plugin/pull/347
+- [GROOVY-5169](https://issues.apache.org/jira/browse/GROOVY-5169)  [GROOVY-10449](https://issues.apache.org/jira/browse/GROOVY-10449)
+  - Fields with a public modifier were not returned with MetaClassImpl#getProperties() in groovy 3, but are now. 
+
+## NOTE: This document is a draft and the explanations are only highlights and will be expanded further prior to release of 7.0.
+
+### Cool New Features
+- You can now @Scaffold Controllers and Services and virtually eliminate any boiler plate code.
+- Hello Exterminator, Good by bugs! Lot's of things started working... and working well! For instance, use of controller namespaces now work seemlessly.
+- Bootstrap 5.3.3 support. Saffolding and Fields tags now optionally support boostrap classes.
+- Priortization of AutoConfiguration over bean overriding.
+- Lightweight, Removal of numerous dependencies.
+- grails-bom overhaul for keeping depedencies up to date and in sync.
+- g:form now automatically provides csrf protection when Spring Security CSRF is enabled.
+- Massive decoupling of dependencies and cleanup between modules.  SiteMesh dependencies are no longer compiled into controllers fused between numerous modules. SiteMesh isn't even required to use Grails!
+- SiteMesh ahs been upgrade to SiteMesh 3!
+- Completely up to date modern stack that has been optimized for easier future transitions.
+- GSP can now be used OUTSIDE of Grails! see grails-boot
+- Works with Spring Security 6 out of the box. No plugin needed!
+- Tested and works with Java [17-23](https://github.com/grails/grails-core/blob/0549617f27aeb5b90b64797fa4147dde40fc9c86/.github/workflows/gradle.yml#L18)

UPGRADE7.md

@@ -1,4 +1,4 @@
-// Generated on Mon Oct 21 14:36:55 PDT 2024 by: ./gradlew :grails-bom:dependabotBuild
+// Generated on Fri Nov 22 09:58:56 CET 2024 by: ./gradlew :grails-bom:dependabotBuild
 plugins {
     id 'java-library'
 }
@@ -7,6 +7,7 @@ dependencies {
     api "org.apache.ant:ant:${project['ant.version']}"
     api "org.apache.ant:ant-junit:${project['ant.version']}"
     api "org.asciidoctor:asciidoctorj:${project['asciidoctorj.version']}"
+    api "com.bertramlabs.plugins:asset-pipeline-gradle:${project['asset-pipeline-gradle.version']}"
     api "com.bertramlabs.plugins:asset-pipeline-grails:${project['asset-pipeline-grails.version']}"
     api "net.bytebuddy:byte-buddy:${project['byte-buddy.version']}"
     api "commons-codec:commons-codec:${project['commons-codec.version']}"
@@ -24,6 +25,7 @@ dependencies {
     api "org.grails:grails-events-rxjava:${project['grails-async.version']}"
     api "org.grails:grails-events-rxjava2:${project['grails-async.version']}"
     api "org.grails:grails-datastore-gorm-hibernate5:${project['grails-datastore-gorm-hibernate5.version']}"
+    api "org.grails:grails-datastore-gorm-mongodb:${project['grails-datastore-gorm-mongodb.version']}"
     api "org.grails:grails-datastore-async:${project['grails-datastore.version']}"
     api "org.grails:grails-datastore-core:${project['grails-datastore.version']}"
     api "org.grails:grails-datastore-gorm:${project['grails-datastore.version']}"

dependabot/build.gradle

@@ -8,8 +8,8 @@ gradleNexusPluginVersion=2.3.1
 gradleNexusPublishPluginVersion=2.0.0
 gradleExtraConfigurationsPluginVersion=10.0.1
 gradleLicensePluginVersion=0.16.1
-gradleToolingApiVersion=8.10.2
-groovyVersion=4.0.23
+gradleToolingApiVersion=8.11.1
+groovyVersion=4.0.24
 joptSimpleVersion=5.0.4
 plexusComponentApiVersion=1.0-alpha-33
 plexusSecDispatcherVersion=1.4
@@ -21,10 +21,11 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M
 
-# Generated on Tue Oct 22 16:16:30 EDT 2024 by: ./gradlew :grails-bom:syncProps
+# Generated on Fri Nov 22 09:58:56 CET 2024 by: ./gradlew :grails-bom:syncProps
 # Only version value modifications allowed after this point. Do not insert or change version names. 
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
+asset-pipeline-gradle.version=5.0.1
 asset-pipeline-grails.version=5.0.1
 byte-buddy.version=1.15.5
 commons-codec.version=1.17.1
@@ -36,10 +37,11 @@ geb-spock.version=7.0
 grails-async.version=6.0.0-SNAPSHOT
 grails-datastore.version=9.0.0-SNAPSHOT
 grails-datastore-gorm-hibernate5.version=9.0.0-SNAPSHOT
+grails-datastore-gorm-mongodb.version=9.0.0-SNAPSHOT
 grails-gdoc-engine.version=1.0.1
 grails-gradle-plugin.version=7.0.0-SNAPSHOT
 grails-testing-support.version=4.0.0-SNAPSHOT
-groovy.version=4.0.23
+groovy.version=4.0.24
 gsp.version=7.0.0-SNAPSHOT
 h2.version=2.3.232
 jackson.version=2.18.1
@@ -75,6 +77,6 @@ profiles-web.version=7.0.1-SNAPSHOT
 profiles-web-plugin.version=7.0.1-SNAPSHOT
 spock.version=2.3-groovy-4.0
 spotbugs-annotations.version=4.8.6
-spring-boot.version=3.4.0-RC1
+spring-boot.version=3.4.0
 springloaded.version=1.2.8.RELEASE
 views-json-testing-support.version=4.0.0-SNAPSHOT

gradle.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -25,6 +25,7 @@ ext {
     // version name = versionNameOverride ?: artifactId-prefixes[0]
     dependenciesOverview = """\
         com.bertramlabs.plugins:asset-pipeline-grails::
+        com.bertramlabs.plugins:asset-pipeline-gradle::
         com.fasterxml.jackson:jackson-bom:::jackson
         com.github.javaparser:javaparser-core::
         com.h2database:h2::
@@ -45,6 +46,7 @@ ext {
         org.grails.plugins:gsp::
         org.grails:grails-async,grails-events:gpars,rxjava,rxjava2::grails-async
         org.grails:grails-datastore-gorm-hibernate5::
+        org.grails:grails-datastore-gorm-mongodb::
         org.grails:grails-datastore:async,core,gorm,gorm-async,gorm-support,gorm-rx,gorm-test,gorm-validation,web:
         org.grails:grails-gdoc-engine::
         org.grails:grails-gradle-plugin::

grails-bom/build.gradle

@@ -8,6 +8,7 @@ neo4j=8.1.0
 rxjava=1.1.1
 rxjava2=2.0.0
 scaffolding=6.0.0-SNAPSHOT
+views-gradle=4.0.0-SNAPSHOT
 views-json=4.0.0-SNAPSHOT
 views-json-templates=4.0.0-SNAPSHOT
 views-markup=4.0.0-SNAPSHOT

grails-bom/plugins.properties

@@ -1,9 +1,3 @@
-configurations.all {
-    resolutionStrategy {
-        force "org.hamcrest:hamcrest-core:1.3"
-    }
-}
-
 dependencies {
     compileOnly "org.aspectj:aspectjrt", "org.aspectj:aspectjweaver"
     api "jakarta.inject:jakarta.inject-api"
@@ -27,7 +21,7 @@ dependencies {
 
     testImplementation "org.springframework:spring-jdbc"
 
-    testImplementation "org.hamcrest:hamcrest-core:1.3"
+    testImplementation "org.hamcrest:hamcrest"
 
     testRuntimeOnly "com.h2database:h2"
     testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind"

grails-core/build.gradle

@@ -541,12 +541,9 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
                 BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
                 bb.setBinding(b);
                 c.setDelegate(bb);
-                c.setResolveStrategy(Closure.OWNER_FIRST);
                 bb.invokeMethod("beans", new Object[]{c});
             }
-        }
-        else {
-
+        } else {
             if (!pluginBean.isReadableProperty(DO_WITH_SPRING)) {
                 return;
             }
@@ -559,7 +556,6 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
             BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
             bb.setBinding(b);
             c.setDelegate(bb);
-            c.setResolveStrategy(Closure.DELEGATE_FIRST);
             bb.invokeMethod("beans", new Object[]{c});
         }
 

grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java

@@ -16,7 +16,6 @@
 package org.grails.transaction;
 
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.*;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -176,7 +175,6 @@ public TestPlatformTransactionManager(String name) {
 			this.name = name;
 		}
 
-		@Factory
 		static PlatformTransactionManager createFailingTransactionManager(String name) {
 			return new TestPlatformTransactionManager(name + "-failing") {
 				@Override
@@ -191,7 +189,6 @@ public void rollback(TransactionStatus status) throws TransactionException {
 			};
 		}
 
-		@Factory
 		static PlatformTransactionManager createNonFailingTransactionManager(String name) {
 			return new TestPlatformTransactionManager(name + "-non-failing");
 		}
@@ -296,12 +293,10 @@ public void describeTo(Description description) {
 			description.appendText("that a " + (commitCheck ? "committed" : "rolled-back") + " TransactionManager");
 		}
 
-		@Factory
 		public static TransactionManagerMatcher isCommitted() {
 			return new TransactionManagerMatcher(true);
 		}
 
-		@Factory
 		public static TransactionManagerMatcher wasRolledback() {
 			return new TransactionManagerMatcher(false);
 		}