Merge branch '7.0.x' into 7.1.x

Author: jdaugherty

.github/ISSUE_TEMPLATE/config.yml

@@ -14,12 +14,12 @@
 # limitations under the License.
 
 contact_links:
+  - name: Grails Mailing Lists
+    url: https://grails.apache.org/community.html
+    about: Ask questions on the Mailing Lists
   - name: Grails Core Discussions
     url: https://github.com/apache/grails-core/discussions
-    about: Ask questions about Grails® framework on Github
-  - name: Stack Overflow
-    url: https://stackoverflow.com/tags/grails
-    about: Ask questions on Stack Overflow
+    about: Discuss Grails® framework on GitHub
   - name: Grails Slack
     url: https://grails.slack.com/
-    about: Chat with us on Grails Community Slack.
+    about: Chat with us on Grails Community Slack.

RELEASE.md

@@ -267,7 +267,7 @@ Confirm the Grails PMC votes passed with a +1 from at least 3 PMC members. The `
 The `release` job in the `Release` workflow has a step entitled `🚀 Release JAR files - MANUAL`. You can release the jar
 files by one of 2 ways:
 
-1. In repository.apache.org, the staged artifacts must be released by opening the `grails-core` staging repository and
+1. On https://repository.apache.org/#stagingRepositories, the staged artifacts must be released by opening the `grails-core` staging repository and
    clicking the `Release` button. It took almost 2 hours for the initial ASF release to publish these jars to Maven
    Central.
 2. Alternatively, the `release` job in the `Release` workflow will output an example command line to release the staging
@@ -276,7 +276,7 @@ files by one of 2 ways:
 
 ### Move the distributions from `dev` to `release`
 
-On dist.apache.org, the staged source distribution & binary distributions must be moved from `dev` to `release`. Per ASF
+On dist.apache.org, the staged source distribution & binary distributions must be moved from `https://dist.apache.org/repos/dist/dev/grails/` to `https://dist.apache.org/repos/dist/release/grails/`. Per ASF
 infrastructure, this must be performed manually, and we are not allowed to automate it via a gated approval workflow.
 Either move them via your SVN client or use the checked in script to perform these actions as your user.
 
@@ -313,7 +313,7 @@ this step.
 ### Publish `grails-core` documentation
 
 Open the release workflow in `grails-core` and approve the `Publish Documentation` step. Wait until finished, and a
-workflow should eventually kick off in `grails-doc` to publish the gh-pages branch that was updated.
+workflow should eventually kick off in `grails-doc` to publish to https://github.com/apache/grails-website/tree/asf-site-production/docs and https://grails.apache.org/docs/.
 
 ### Advertise the release via SDKMAN
 
@@ -322,15 +322,17 @@ version from Maven Central.
 
 ### Close out the `grails-core` release
 
-The last step in the `grails-core` release workflow is to run the `Close Release` step.  This will create a merge branch for the original tag with version number and then open a PR to merge back into the next branch.  You will need to merge it into the branch after correcting any merge conflict.
+The last step in the `grails-core` release workflow is to run the `Close Release` step.  This will create a merge branch for the original tag with version number and then open a PR to merge back into the next branch.  You will need to merge this PR into the branch after correcting any merge conflict.
 
 ### Update the `grails-static-website`
 
 On the `grails-static-website` repository:
 
-Run the release action (https://github.com/apache/grails-static-website/actions/workflows/release.yml) with the new version to update https://github.com/apache/grails-static-website/blob/HEAD/conf/releases.yml and then run the publish action (https://github.com/apache/grails-static-website/actions/workflows/publish.yml) to update the `asf-site-production` branch and https://grails.apache.org
+Run the release action (https://github.com/apache/grails-static-website/actions/workflows/release.yml) with the new version to update https://github.com/apache/grails-static-website/blob/HEAD/conf/releases.yml
 
-Create a new `.md` file in the `/posts` directory announcing the release.  Wwhen the PR is merged it will deploy to https://grails.apache.org
+Then run the publish action (https://github.com/apache/grails-static-website/actions/workflows/publish.yml) to update https://github.com/apache/grails-website/tree/asf-site-production/ and publish to https://grails.apache.org
+
+Create a new `.md` file in the `/posts` directory announcing the release.  When the PR is merged it will deploy to https://grails.apache.org
 
 ### Flag release in `grails-core` as latest
 
@@ -339,7 +341,7 @@ Update the release in `grails-core` to be flagged as 'latest'
 ### Announce the release
 
 Announcements should come from your apache email address (see https://infra.apache.org/committer-email.html) and have an
-expected format. The announcement should be sent to `[email protected]`, `[email protected]`, &
+expected format. The announcement should be sent to `[email protected]`, `[email protected]`, `[email protected]`, &
 `[email protected]`. See the `close` job for a generated email.
 
 # Rollback

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy

@@ -67,7 +67,7 @@ class SbomPlugin implements Plugin<Project> {
             ],
             'BSD-2-Clause': [
                     id : 'BSD-2-Clause',
-                    url: 'https://opensource.org/license/bsd-3-clause/'
+                    url: 'https://opensource.org/license/bsd-2-clause/'
             ],
             'BSD-3-Clause': [
                     id : 'BSD-3-Clause',

dependencies.gradle

@@ -38,7 +38,7 @@ ext {
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
             'gradle-spock.version'          : '2.3-groovy-3.0',
-            'spring-boot.version'           : '3.5.6',
+            'spring-boot.version'           : '3.5.7',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -73,7 +73,7 @@ ext {
             'bootstrap.version'           : '5.3.7',
             'commons-codec.version'       : '1.18.0',
             'geb-spock.version'           : '8.0.0',
-            'groovy.version'              : '4.0.28',
+            'groovy.version'              : '4.0.29',
             'h2.version'                  : '2.3.232',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',

gradle.properties

@@ -54,7 +54,7 @@ gradleCycloneDxPluginVersion=2.4.1
 micronautPlatformVersion=4.9.2
 
 # Libraries only specific to test apps, these should not be exposed
-grailsSpringSecurityVersion=7.0.0-SNAPSHOT
+grailsSpringSecurityVersion=7.0.1-SNAPSHOT
 jbossTransactionApiVersion=2.0.0.Final
 # Note: we do not import the micronaut bom in our tests to avoid spring version mismatches
 micronautHttpClientVersion=4.9.9

grails-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java

@@ -941,8 +941,7 @@ protected void initializePrimitiveOrTypeWrapperParameter(final ClassNode classNo
         Statement declareVariableStatement = new ExpressionStatement(declareConvertedValueExpression);
         wrapper.addStatement(declareVariableStatement);
 
-        final VariableExpression methodParamExpression = new VariableExpression(
-                methodParamName, paramTypeClassNode);
+        final VariableExpression methodParamExpression = localVarX(methodParamName, paramTypeClassNode);
         final DeclarationExpression declareParameterVariableStatement = new DeclarationExpression(
                 methodParamExpression, equalsToken, new EmptyExpression());
         declareVariableStatement = new ExpressionStatement(declareParameterVariableStatement);

grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java

@@ -31,6 +31,7 @@
 import jakarta.persistence.FlushModeType;
 
 import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCommandException;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoIterable;
 import com.mongodb.client.model.IndexOptions;
@@ -846,7 +847,11 @@ protected void initializeIndices(final PersistentEntity entity) {
                 for (MongoCollection.Index index : indices) {
                     final Map<String, Object> options = index.getOptions();
                     final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);
-                    collection.createIndex(new Document(index.getDefinition()), indexOptions);
+                    try {
+                        collection.createIndex(new Document(index.getDefinition()), indexOptions);
+                    } catch (MongoCommandException e) {
+                        LOG.error("Failed to create index for entity [" + entity.getName() + "] with definition [" + index.getDefinition() + "]: " + e.getMessage(), e);
+                    }
                 }
 
                 for (Map compoundIndex : mappedForm.getCompoundIndices()) {
@@ -859,11 +864,15 @@ protected void initializeIndices(final PersistentEntity entity) {
                         }
                     }
                     Document indexDef = new Document(compoundIndex);
-                    if (indexAttributes != null) {
-                        final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, indexAttributes);
-                        collection.createIndex(indexDef, indexOptions);
-                    } else {
-                        collection.createIndex(indexDef);
+                    try {
+                        if (indexAttributes != null) {
+                            final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, indexAttributes);
+                            collection.createIndex(indexDef, indexOptions);
+                        } else {
+                            collection.createIndex(indexDef);
+                        }
+                    } catch (MongoCommandException e) {
+                        LOG.error("Failed to create compound index for entity [" + entity.getName() + "] with definition [" + indexDef + "]: " + e.getMessage(), e);
                     }
                 }
             }
@@ -889,11 +898,15 @@ protected void initializeIndices(final PersistentEntity entity) {
                     }
                 }
                 // continue using deprecated method to support older versions of MongoDB
-                if (options.isEmpty()) {
-                    collection.createIndex(dbObject);
-                } else {
-                    final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);
-                    collection.createIndex(dbObject, indexOptions);
+                try {
+                    if (options.isEmpty()) {
+                        collection.createIndex(dbObject);
+                    } else {
+                        final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);
+                        collection.createIndex(dbObject, indexOptions);
+                    }
+                } catch (MongoCommandException e) {
+                    LOG.error("Failed to create index for entity [" + entity.getName() + "] on property [" + property.getName() + "]: " + e.getMessage(), e);
                 }
             }
         }

grails-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java

@@ -177,6 +177,11 @@ ValueConverter instantValueConverter() {
         return jsr310ConvertersConfiguration.instantValueConverter();
     }
 
+    @Bean("instantStructuredBindingEditor")
+    TypedStructuredBindingEditor instantStructuredBindingEditor() {
+        return jsr310ConvertersConfiguration.instantStructuredBindingEditor();
+    }
+
     @Bean("defaultUUIDConverter")
     protected UUIDConverter defaultuuidConverter() {
         return new UUIDConverter();

grails-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy

@@ -388,6 +388,21 @@ class Jsr310ConvertersConfiguration {
         }
     }
 
+    @Bean
+    TypedStructuredBindingEditor instantStructuredBindingEditor() {
+        new CustomDateBindingEditor<Instant>() {
+            @Override
+            Instant getDate(Calendar c) {
+                c.toInstant()
+            }
+
+            @Override
+            Class<?> getTargetType() {
+                Instant
+            }
+        }
+    }
+
     abstract class Jsr310DateValueConverter<T> implements ValueConverter {
 
         @Override

grails-datamapping-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy

@@ -20,6 +20,7 @@
 package grails.gorm.async
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 import org.grails.datastore.gorm.GormEnhancer
 import org.grails.datastore.gorm.GormEntity
@@ -37,6 +38,7 @@ trait AsyncEntity<D> extends GormEntity<D> {
     /**
      * @return The async version of the GORM static API
      */
+    @Generated
     static GormAsyncStaticApi<D> getAsync() {
         return new GormAsyncStaticApi(GormEnhancer.findStaticApi(this))
     }