Merge branch '7.0.x' into use-gradle-properties-versions

jamesfredley · jamesfredley · commit a354ace5cbc9 · 2025-06-26T11:03:41.000-04:00
# Conflicts:
#	grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw
@@ -62,7 +62,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform("org.apache.grails:grails-gradle-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 @for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {
     @dependency.toSnippet()
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ repositories {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`dependencies {`
`65`		`- implementation platform("org.apache.grails:grails-gradle-bom:$grailsVersion")`
	`65`	`+ implementation platform("org.apache.grails:grails-bom:$grailsVersion")`
`66`	`66`	`@for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {`
`67`	`67`	`@dependency.toSnippet()`
`68`	`68`	`}`