Merge branch '7.0.x' into 7.1.x

jdaugherty · jdaugherty · commit c9bfefb510f3 · 2026-04-28T21:48:37.000-04:00
diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle
@@ -30,6 +30,7 @@ def publishedProjects = [
         'grails-async-rxjava',
         'grails-async-rxjava2',
         'grails-async-rxjava3',
+        'grails-base-bom',
         'grails-bom',
         'grails-hibernate5-bom',
         'grails-micronaut-bom',
@@ -218,4 +219,4 @@ aggregatePublishedArtifacts.configure {
 
         println "Published artifacts written to ${outputFile}"
     }
-}
+}
diff --git a/grails-bom/base/build.gradle b/grails-bom/base/build.gradle
@@ -27,6 +27,7 @@ buildscript {
 
 plugins {
     id 'java-platform'
+    id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
 }
 
diff --git a/settings.gradle b/settings.gradle
@@ -111,7 +111,7 @@ include(
         'grails-dependencies-starter-web',
         'grails-dependencies-test',
         'grails-dependencies-assets',
-        'grails-base-bom', // Not published
+        'grails-base-bom',
         'grails-bom', // the default bom
         'grails-hibernate5-bom',
         'grails-micronaut-bom',

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ buildscript {`
`27`	`27`
`28`	`28`	`plugins {`
`29`	`29`	`id 'java-platform'`
	`30`	`+ id 'org.apache.grails.buildsrc.publish'`
`30`	`31`	`id 'org.apache.grails.buildsrc.sbom'`
`31`	`32`	`}`
`32`	`33`