From 324e880510fca8cca1e7ae315f0e845e90215c01 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Mon, 14 Apr 2025 10:36:31 +0200 Subject: [PATCH 1/2] build: update Develocity Plugin to v4 The Groovy build is now compatible with Develocity Plugin version 4, so we upgrade accordingly. --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 51042f86d05..dd7574d84f0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.gradle.develocity' version '3.19.2' // Do not upgrade to v4 until Groovy can build with it: https://lists.apache.org/thread/z3ohqxxmdm9p1y18j6mk1cpp6fvnz6k7 + id 'com.gradle.develocity' version '4.0' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.2.1' } From 879e109ccb872a54d1575f43f9a5c2b55cb06f4c Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Mon, 14 Apr 2025 11:06:11 +0200 Subject: [PATCH 2/2] test: fix flaky date comparison test failure --- .../org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy index 15407af28d6..9abb470b980 100644 --- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy +++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy @@ -37,7 +37,7 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec { when:"An entity is persisted" def r = new RecordCustom(name: "Test") def now = new Date() - r.created = new Date() + r.created = new Date(now.time) r.modified = r.created r.save(flush:true, failOnError:true) session.clear() @@ -68,7 +68,7 @@ class CustomAutoTimestampSpec extends GormDatastoreSpec { def r = new RecordCustom(name: "Test") def now = new Date() - r.created = new Date() + r.created = new Date(now.time) r.modified = r.created r.save(flush:true, failOnError:true) session.clear()