Merge branch '7.0.x' into 7.0.x-autotimestamp-enhancements

codeconsole · codeconsole · commit bb3951b50723 · 2025-10-24T22:26:44.000-07:00
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.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.
diff --git a/dependencies.gradle b/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',
diff --git a/grails-data-mongodb/core/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java b/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);
                 }
             }
         }
diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java b/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();
diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy b/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
diff --git a/grails-fields/grails-app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy b/grails-fields/grails-app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy
@@ -20,8 +20,12 @@ package grails.plugin.formfields
 
 import java.sql.Blob
 import java.text.NumberFormat
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.ZonedDateTime
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
@@ -726,7 +730,7 @@ class FormFieldsTagLib {
         }
 
         // TODO: https://github.com/apache/grails-core/issues/14198
-        boolean datePicker = model.type in [Date, Calendar, java.sql.Date, java.sql.Time, LocalDate, LocalDateTime]
+        boolean datePicker = model.type in [Date, Calendar, java.sql.Date, java.sql.Time, java.sql.Timestamp, LocalDate, LocalDateTime, Instant, ZonedDateTime, OffsetDateTime]
         if (!datePicker) {
             attrs.remove('selectDateClass')
         }
@@ -948,13 +952,22 @@ class FormFieldsTagLib {
             case Boolean:
                 g.formatBoolean(boolean: model.value)
                 break
-            case Calendar:
-            case Date:
+            case LocalDate:
             case java.sql.Date:
+                g.formatDate(date: model.value, type: 'DATE')
+                break
             case java.sql.Time:
-            case LocalDate:
+            case LocalTime:
+                g.formatDate(date: model.value, type: 'TIME')
+                break
+            case Calendar:
+            case Date:
             case LocalDateTime:
-                g.formatDate(date: model.value)
+            case java.sql.Timestamp:
+            case Instant:
+            case ZonedDateTime:
+            case OffsetDateTime:
+                g.formatDate(date: model.value, type: 'DATETIME')
                 break
             default:
                 g.fieldValue(bean: model.bean, field: model.property)
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/DisplayWidgetSpec.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/DisplayWidgetSpec.groovy
@@ -18,6 +18,7 @@
  */
 package grails.plugin.formfields
 
+import grails.plugin.formfields.mock.Cyborg
 import grails.plugin.formfields.mock.Person
 import grails.plugin.formfields.taglib.AbstractFormFieldsTagLibSpec
 import grails.testing.web.taglib.TagLibUnitTest
@@ -27,7 +28,7 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
 	def mockFormFieldsTemplateService = Mock(FormFieldsTemplateService)
 
 	def setupSpec() {
-		mockDomain(Person)
+		mockDomains(Person, Cyborg)
 	}
 
 	def setup() {
@@ -37,7 +38,17 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
 
 	void 'f:displayWidget without template and a date value renders the formatted date'() {
 		expect:
-		applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}"/>', [personInstance: personInstance])
+		applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
+	}
+
+	void 'f:displayWidget without template and an instant value renders the formatted date'() {
+		expect:
+		applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}" type="DATETIME"/>', [cyborgInstance: cyborgInstance])
+	}
+
+	void 'f:displayWidget without template and a LocalDate value renders the formatted date'() {
+		expect:
+		applyTemplate('<f:displayWidget bean="cyborgInstance" property="birthDate"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.birthDate}" type="DATE"/>', [cyborgInstance: cyborgInstance])
 	}
 
 	void 'f:displayWidget without template and a boolean value renders the formatted boolean'() {
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/mock/Person.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/mock/Person.groovy
@@ -18,13 +18,18 @@
  */
 package grails.plugin.formfields.mock
 
+import java.time.Instant
+import java.time.LocalDate
+
 import grails.gorm.annotation.AutoTimestamp
 import grails.persistence.Entity
 
 @Entity
 class Cyborg extends Person {
 	@AutoTimestamp(AutoTimestamp.EventType.CREATED) Date created
 	@AutoTimestamp Date modified
+	Instant timestamp
+	LocalDate birthDate
 }
 
 @Entity
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/AbstractFormFieldsTagLibSpec.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/AbstractFormFieldsTagLibSpec.groovy
@@ -19,6 +19,9 @@
 
 package grails.plugin.formfields.taglib
 
+import java.time.Instant
+import java.time.LocalDate
+
 import grails.core.support.proxy.DefaultProxyHandler
 import grails.plugin.formfields.BeanPropertyAccessorFactory
 import grails.plugin.formfields.FieldsGrailsPlugin
@@ -45,7 +48,7 @@ abstract class AbstractFormFieldsTagLibSpec extends Specification implements Gra
 		personInstance.address = new Address(street: "94 Evergreen Terrace", city: "Springfield", country: "USA")
 		personInstance.emails = [home: "bart@thesimpsons.net", school: "bart.simpson@springfieldelementary.edu"]
         productInstance = new Product(netPrice: 12.33, name: "<script>alert('XSS');</script>")
-		cyborgInstance = new Cyborg(name: "Hal", password: "monolith", gender: null)
+		cyborgInstance = new Cyborg(name: "Hal", password: "monolith", gender: null, timestamp: Instant.parse("2025-10-16T00:12:15.195Z"), birthDate: LocalDate.of(2025, 10, 15))
 	}
 
 	def cleanup() {
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/DisplayTagSpec.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/DisplayTagSpec.groovy
@@ -98,7 +98,7 @@ class DisplayTagSpec extends AbstractFormFieldsTagLibSpec implements TagLibUnitT
 
 	void 'renders date values using g:formatDate'() {
 		expect:
-		applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) ==~ /1987-04-19 00:00:00 [A-Z]{3,4}/
+		applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
 	}
 
 	void 'displays using template if one is present'() {
diff --git a/grails-gradle/model/src/main/groovy/grails/util/BuildSettings.groovy b/grails-gradle/model/src/main/groovy/grails/util/BuildSettings.groovy
@@ -253,7 +253,7 @@ class BuildSettings {
         }
         BASE_DIR = System.getProperty(APP_BASE_DIR) ? new File(System.getProperty(APP_BASE_DIR)) : (IOUtils.findApplicationDirectoryFile() ?: new File('.'))
         GRAILS_APP_DIR_PRESENT = new File(BASE_DIR, 'grails-app').exists() || new File(BASE_DIR, 'Application.groovy').exists()
-        TARGET_DIR = new File(BASE_DIR, 'build')
+        TARGET_DIR = System.getProperty(PROJECT_TARGET_DIR) ? new File(BASE_DIR, System.getProperty(PROJECT_TARGET_DIR)) : new File(BASE_DIR, 'build')
         RESOURCES_DIR = !GRAILS_APP_DIR_PRESENT ? null : (System.getProperty(PROJECT_RESOURCES_DIR) ? new File(System.getProperty(PROJECT_RESOURCES_DIR)) : new File(TARGET_DIR, 'resources/main'))
     }
 }
diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
@@ -460,6 +460,7 @@ ${importStatements}
     @CompileStatic
     protected String configureGrailsBuildSettings(Project project) {
         System.setProperty(BuildSettings.APP_BASE_DIR, project.projectDir.absolutePath)
+        System.setProperty(BuildSettings.PROJECT_TARGET_DIR, project.layout.buildDirectory.get().asFile.name)
     }
 
     @CompileDynamic
diff --git a/grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/DefaultGrailsTagDateHelper.groovy b/grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/DefaultGrailsTagDateHelper.groovy
@@ -93,6 +93,8 @@ class DefaultGrailsTagDateHelper implements GrailsTagDateHelper {
         TemporalAccessor instant
         if (date instanceof java.sql.Date) {
             instant = date.toLocalDate()
+        } else if (date instanceof java.sql.Time) {
+            instant = date.toLocalTime()
         } else if (date instanceof Date) {
             instant = date.toInstant()
         } else if (date instanceof Calendar) {
@@ -134,6 +136,8 @@ class DefaultGrailsTagDateHelper implements GrailsTagDateHelper {
                 zonedDateTime = ZonedDateTime.of(date, ZoneId.systemDefault())
             } else if (date instanceof LocalDate) {
                 zonedDateTime = ZonedDateTime.of(date, LocalTime.MIN, ZoneId.systemDefault())
+            } else if (date instanceof Instant) {
+                zonedDateTime = ZonedDateTime.ofInstant(date, ZoneId.systemDefault())
             } else if (date instanceof OffsetDateTime) {
                 zonedDateTime = ((OffsetDateTime) date).toZonedDateTime()
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`import jakarta.persistence.FlushModeType;`
`32`	`32`
`33`	`33`	`import com.mongodb.MongoClientSettings;`
	`34`	`+import com.mongodb.MongoCommandException;`
`34`	`35`	`import com.mongodb.client.MongoClient;`
`35`	`36`	`import com.mongodb.client.MongoIterable;`
`36`	`37`	`import com.mongodb.client.model.IndexOptions;`
`@@ -846,7 +847,11 @@ protected void initializeIndices(final PersistentEntity entity) {`
`846`	`847`	`for (MongoCollection.Index index : indices) {`
`847`	`848`	`final Map<String, Object> options = index.getOptions();`
`848`	`849`	`final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);`
`849`		`- collection.createIndex(new Document(index.getDefinition()), indexOptions);`
	`850`	`+ try {`
	`851`	`+ collection.createIndex(new Document(index.getDefinition()), indexOptions);`
	`852`	`+ } catch (MongoCommandException e) {`
	`853`	`+ LOG.error("Failed to create index for entity [" + entity.getName() + "] with definition [" + index.getDefinition() + "]: " + e.getMessage(), e);`
	`854`	`+ }`
`850`	`855`	`}`
`851`	`856`
`852`	`857`	`for (Map compoundIndex : mappedForm.getCompoundIndices()) {`
`@@ -859,11 +864,15 @@ protected void initializeIndices(final PersistentEntity entity) {`
`859`	`864`	`}`
`860`	`865`	`}`
`861`	`866`	`Document indexDef = new Document(compoundIndex);`
`862`		`- if (indexAttributes != null) {`
`863`		`- final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, indexAttributes);`
`864`		`- collection.createIndex(indexDef, indexOptions);`
`865`		`- } else {`
`866`		`- collection.createIndex(indexDef);`
	`867`	`+ try {`
	`868`	`+ if (indexAttributes != null) {`
	`869`	`+ final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, indexAttributes);`
	`870`	`+ collection.createIndex(indexDef, indexOptions);`
	`871`	`+ } else {`
	`872`	`+ collection.createIndex(indexDef);`
	`873`	`+ }`
	`874`	`+ } catch (MongoCommandException e) {`
	`875`	`+ LOG.error("Failed to create compound index for entity [" + entity.getName() + "] with definition [" + indexDef + "]: " + e.getMessage(), e);`
`867`	`876`	`}`
`868`	`877`	`}`
`869`	`878`	`}`
`@@ -889,11 +898,15 @@ protected void initializeIndices(final PersistentEntity entity) {`
`889`	`898`	`}`
`890`	`899`	`}`
`891`	`900`	`// continue using deprecated method to support older versions of MongoDB`
`892`		`- if (options.isEmpty()) {`
`893`		`- collection.createIndex(dbObject);`
`894`		`- } else {`
`895`		`- final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);`
`896`		`- collection.createIndex(dbObject, indexOptions);`
	`901`	`+ try {`
	`902`	`+ if (options.isEmpty()) {`
	`903`	`+ collection.createIndex(dbObject);`
	`904`	`+ } else {`
	`905`	`+ final IndexOptions indexOptions = MongoConstants.mapToObject(IndexOptions.class, options);`
	`906`	`+ collection.createIndex(dbObject, indexOptions);`
	`907`	`+ }`
	`908`	`+ } catch (MongoCommandException e) {`
	`909`	`+ LOG.error("Failed to create index for entity [" + entity.getName() + "] on property [" + property.getName() + "]: " + e.getMessage(), e);`
`897`	`910`	`}`
`898`	`911`	`}`
`899`	`912`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class DisplayTagSpec extends AbstractFormFieldsTagLibSpec implements TagLibUnitT`
`98`	`98`
`99`	`99`	`void 'renders date values using g:formatDate'() {`
`100`	`100`	`expect:`
`101`		`- applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) ==~ /1987-04-19 00:00:00 [A-Z]{3,4}/`
	`101`	`+ applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`void 'displays using template if one is present'() {`