From d6324afc90b9583cdbdd457c60f6ed9d255d0cf8 Mon Sep 17 00:00:00 2001
From: James Daugherty <jdaugherty@jdresources.net>
Date: Mon, 3 Mar 2025 08:47:48 -0500
Subject: [PATCH 1/2] Switch to grails-bom

---
 build.gradle                                             | 9 ++++++---
 gradle.properties                                        | 3 ---
 .../grails/plugin/formfields/FieldsGrailsPlugin.groovy   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 68b87b2a..f7c2d3b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,8 @@ buildscript {
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+        classpath platform("org.grails:grails-bom:${grailsVersion}")
+        classpath "org.grails:grails-gradle-plugin"
     }
 }
 
@@ -30,12 +31,14 @@ repositories {
 }
 
 dependencies {
+    implementation platform("org.grails:grails-bom:${grailsVersion}")
+
     compileOnly 'org.springframework.boot:spring-boot-starter-logging'
     compileOnly "org.springframework.boot:spring-boot-starter-actuator"
     compileOnly "org.springframework.boot:spring-boot-autoconfigure"
     compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
     compileOnly "org.grails:grails-plugin-controllers"
-    compileOnly "org.grails.plugins:gsp:${grailsVersion}"
+    compileOnly "org.grails.plugins:gsp"
 
     testImplementation "org.grails:grails-web-testing-support"
     testImplementation "org.grails:grails-gorm-testing-support"
@@ -49,7 +52,7 @@ dependencies {
 
     testRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion"
 
-    testImplementation "org.grails:grails-datastore-gorm-hibernate5:$gormHibernate5Version"
+    testImplementation "org.grails:grails-datastore-gorm-hibernate5"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/gradle.properties b/gradle.properties
index 5b6b628f..017a0307 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,6 @@
 #Mon, 08 Apr 2024 19:48:24 +0000
 projectVersion=6.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
-grailsScaffoldingVersion=2.1.0
-gormHibernate5Version=9.0.0-SNAPSHOT
 joddWotVersion=3.3.8
 byteBuddyVersion=1.14.12
 asciidoc=true
diff --git a/src/main/groovy/grails/plugin/formfields/FieldsGrailsPlugin.groovy b/src/main/groovy/grails/plugin/formfields/FieldsGrailsPlugin.groovy
index b8245e19..9ff9711b 100644
--- a/src/main/groovy/grails/plugin/formfields/FieldsGrailsPlugin.groovy
+++ b/src/main/groovy/grails/plugin/formfields/FieldsGrailsPlugin.groovy
@@ -23,7 +23,7 @@ class FieldsGrailsPlugin extends Plugin {
 
     static final String CONSTRAINTS_EVALULATOR_BEAN_NAME = 'validateableConstraintsEvaluator'
 
-    def grailsVersion = '5.0 > *'
+    def grailsVersion = '7.0.0-SNAPSHOT > *'
 
     def loadAfter = ['domainClass']
 

From 8aa912e068ad653e66d998344ada4ef1f270eb71 Mon Sep 17 00:00:00 2001
From: James Daugherty <jdaugherty@jdresources.net>
Date: Mon, 3 Mar 2025 09:01:53 -0500
Subject: [PATCH 2/2] Use bytebuddy from the bom

---
 build.gradle      | 2 +-
 gradle.properties | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f7c2d3b8..5bbe30c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ dependencies {
         exclude module: 'asm'
     }
 
-    testRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion"
+    testRuntimeOnly "net.bytebuddy:byte-buddy"
 
     testImplementation "org.grails:grails-datastore-gorm-hibernate5"
 }
diff --git a/gradle.properties b/gradle.properties
index 017a0307..d0ee3295 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,6 @@
 projectVersion=6.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
 joddWotVersion=3.3.8
-byteBuddyVersion=1.14.12
 asciidoc=true
 
 org.gradle.caching=true