You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/04/26 15:22:02 UTC

(grails-core) 01/08: Backport bom changes to 7.0.x

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch grailsBomRestructure
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit f8fac910e33ab7e1a607ca2eaca14a50ceb41eb4
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Sun Apr 26 10:56:55 2026 -0400

    Backport bom changes to 7.0.x
---
 .github/workflows/gradle.yml                       |  26 ++
 .../tasks/bom/ExtractDependenciesTask.groovy       |  11 +
 build-logic/plugins/build.gradle                   |   4 +
 .../org/apache/grails/buildsrc/GradleUtils.groovy  |   4 +
 .../GrailsDependencyValidatorPlugin.groovy         | 303 +++++++++++++++++++++
 dependencies.gradle                                |  31 ++-
 gradle/publish-root-config.gradle                  |   1 +
 gradle/rat-root-config.gradle                      |   1 +
 grails-async/core/build.gradle                     |   1 +
 grails-async/gpars/build.gradle                    |   1 +
 grails-async/plugin/build.gradle                   |   1 +
 grails-async/rxjava/build.gradle                   |   1 +
 grails-async/rxjava2/build.gradle                  |   1 +
 grails-async/rxjava3/build.gradle                  |   1 +
 grails-bom/README.md                               |  19 --
 grails-bom/{ => base}/build.gradle                 |  20 +-
 grails-bom/{ => default}/build.gradle              |  52 ++--
 grails-bom/{ => hibernate5}/build.gradle           |  56 ++--
 grails-bootstrap/build.gradle                      |   1 +
 grails-cache/build.gradle                          |   1 +
 grails-codecs-core/build.gradle                    |   1 +
 grails-codecs/build.gradle                         |   1 +
 grails-common/build.gradle                         |   1 +
 grails-console/build.gradle                        |   1 +
 grails-controllers/build.gradle                    |   1 +
 grails-converters/build.gradle                     |   1 +
 grails-core/build.gradle                           |   1 +
 grails-data-hibernate5/boot-plugin/build.gradle    |   1 +
 grails-data-hibernate5/core/build.gradle           |   7 +-
 grails-data-hibernate5/dbmigration/build.gradle    |  26 +-
 grails-data-hibernate5/docs/build.gradle           |   2 +-
 grails-data-hibernate5/grails-plugin/build.gradle  |   5 +-
 grails-data-mongodb/boot-plugin/build.gradle       |   1 +
 grails-data-mongodb/bson/build.gradle              |   1 +
 grails-data-mongodb/core/build.gradle              |   1 +
 grails-data-mongodb/ext/build.gradle               |   1 +
 grails-data-mongodb/grails-plugin/build.gradle     |   1 +
 grails-data-mongodb/gson-templates/build.gradle    |   1 +
 grails-data-simple/build.gradle                    |   1 +
 grails-databinding-core/build.gradle               |   1 +
 grails-databinding/build.gradle                    |   1 +
 grails-datamapping-async/build.gradle              |   1 +
 grails-datamapping-core-test/build.gradle          |   1 +
 grails-datamapping-core/build.gradle               |   1 +
 grails-datamapping-rx/build.gradle                 |   1 +
 grails-datamapping-support/build.gradle            |   1 +
 grails-datamapping-tck/build.gradle                |   1 +
 grails-datamapping-validation/build.gradle         |   1 +
 grails-datasource/build.gradle                     |   1 +
 grails-datastore-async/build.gradle                |   1 +
 grails-datastore-core/build.gradle                 |   1 +
 grails-datastore-web/build.gradle                  |   1 +
 grails-dependencies/assets/build.gradle            |   1 +
 grails-dependencies/starter-web/build.gradle       |   1 +
 grails-dependencies/test/build.gradle              |   1 +
 grails-doc/build.gradle                            |   1 +
 grails-domain-class/build.gradle                   |   1 +
 grails-encoder/build.gradle                        |   1 +
 grails-events/compat/build.gradle                  |   1 +
 grails-events/core/build.gradle                    |   1 +
 grails-events/gpars/build.gradle                   |   1 +
 grails-events/plugin/build.gradle                  |   1 +
 grails-events/rxjava/build.gradle                  |   1 +
 grails-events/rxjava2/build.gradle                 |   1 +
 grails-events/rxjava3/build.gradle                 |   1 +
 grails-events/spring/build.gradle                  |   1 +
 grails-events/transforms/build.gradle              |   1 +
 grails-fields/build.gradle                         |   1 +
 grails-forge/build.gradle                          |   1 +
 grails-forge/buildSrc/build.gradle                 |   1 +
 grails-forge/grails-cli-shadow/build.gradle        |   1 +
 grails-forge/grails-cli/build.gradle               |   1 +
 .../grails-forge-analytics-postgres/build.gradle   |   1 +
 grails-forge/grails-forge-api/build.gradle         |   1 +
 grails-forge/grails-forge-cli/build.gradle         |   1 +
 grails-forge/grails-forge-core/build.gradle        |   1 +
 grails-forge/grails-forge-web-netty/build.gradle   |   1 +
 grails-forge/test-core/build.gradle                |   1 +
 grails-geb/build.gradle                            |   1 +
 grails-gradle/bom/build.gradle                     |   1 +
 grails-gradle/build.gradle                         |   1 +
 grails-gradle/buildSrc/build.gradle                |   1 +
 grails-gradle/common/build.gradle                  |   1 +
 grails-gradle/model/build.gradle                   |   1 +
 grails-gradle/plugins/build.gradle                 |   1 +
 grails-gradle/tasks/build.gradle                   |   1 +
 grails-gsp/core/build.gradle                       |   1 +
 grails-gsp/grails-layout/build.gradle              |   1 +
 grails-gsp/grails-sitemesh3/build.gradle           |   1 +
 grails-gsp/grails-taglib/build.gradle              |   1 +
 grails-gsp/grails-web-gsp-taglib/build.gradle      |   1 +
 grails-gsp/grails-web-gsp/build.gradle             |   1 +
 grails-gsp/grails-web-jsp/build.gradle             |   1 +
 grails-gsp/grails-web-taglib/build.gradle          |   1 +
 grails-gsp/plugin/build.gradle                     |   1 +
 grails-gsp/spring-boot/build.gradle                |   1 +
 grails-i18n/build.gradle                           |   1 +
 grails-interceptors/build.gradle                   |   1 +
 grails-logging/build.gradle                        |   1 +
 grails-micronaut/build.gradle                      |   1 +
 grails-mimetypes/build.gradle                      |   1 +
 grails-rest-transforms/build.gradle                |   1 +
 grails-scaffolding/build.gradle                    |   1 +
 grails-services/build.gradle                       |   1 +
 grails-shell-cli/build.gradle                      |   1 +
 grails-spring/build.gradle                         |   1 +
 grails-test-core/build.gradle                      |   1 +
 grails-test-examples/app1/build.gradle             |   1 +
 grails-test-examples/app2/build.gradle             |   1 +
 grails-test-examples/app3/build.gradle             |   1 +
 .../async-events-pubsub-demo/build.gradle          |   1 +
 grails-test-examples/cache/build.gradle            |   1 +
 grails-test-examples/config-report/build.gradle    |   1 +
 grails-test-examples/database-cleanup/build.gradle |   3 +-
 grails-test-examples/datasources/build.gradle      |   1 +
 grails-test-examples/demo33/build.gradle           |   1 +
 grails-test-examples/exploded/build.gradle         |   1 +
 .../external-configuration/build.gradle            |   1 +
 grails-test-examples/geb-gebconfig/build.gradle    |   1 +
 grails-test-examples/geb/build.gradle              |   1 +
 grails-test-examples/gorm/build.gradle             |   3 +-
 grails-test-examples/gsp-layout/build.gradle       |   1 +
 grails-test-examples/gsp-sitemesh3/build.gradle    |   1 +
 .../build.gradle                                   |   1 +
 .../hibernate5/grails-data-service/build.gradle    |   1 +
 .../grails-database-per-tenant/build.gradle        |   1 +
 .../grails-hibernate-groovy-proxy/build.gradle     |   3 +-
 .../hibernate5/grails-hibernate/build.gradle       |   3 +-
 .../grails-multiple-datasources/build.gradle       |   1 +
 .../build.gradle                                   |   1 +
 .../grails-partitioned-multi-tenancy/build.gradle  |   1 +
 .../grails-schema-per-tenant/build.gradle          |   1 +
 .../hibernate5/issue450/build.gradle               |   1 +
 .../hibernate5/spring-boot-hibernate/build.gradle  |   1 +
 .../hibernate5/standalone-hibernate/build.gradle   |   1 +
 grails-test-examples/hyphenated/build.gradle       |   3 +-
 grails-test-examples/issue-11102/build.gradle      |   1 +
 grails-test-examples/issue-11767/build.gradle      |   1 +
 grails-test-examples/issue-15228/build.gradle      |   1 +
 .../issue-698-domain-save-npe/build.gradle         |   1 +
 grails-test-examples/issue-views-182/build.gradle  |   1 +
 .../micronaut-groovy-only/build.gradle             |   1 +
 grails-test-examples/micronaut/build.gradle        |   1 +
 grails-test-examples/mongodb/base/build.gradle     |   1 +
 .../mongodb/database-per-tenant/build.gradle       |   1 +
 .../mongodb/gson-templates/build.gradle            |   1 +
 .../mongodb/hibernate5/build.gradle                |   3 +-
 .../mongodb/springboot/build.gradle                |   1 +
 .../mongodb/test-data-service/build.gradle         |   1 +
 grails-test-examples/namespaces/build.gradle       |   1 +
 grails-test-examples/plugins/exploded/build.gradle |   1 +
 .../plugins/issue-11767/build.gradle               |   1 +
 .../plugins/issue11005/build.gradle                |   1 +
 .../plugins/loadafter/build.gradle                 |   1 +
 .../plugins/loadfirst/build.gradle                 |   1 +
 .../plugins/loadsecond/build.gradle                |   1 +
 .../plugins/micronaut-singleton/build.gradle       |   1 +
 .../scaffolding-fields/build.gradle                |   1 +
 grails-test-examples/scaffolding/build.gradle      |   1 +
 .../views-functional-tests-plugin/build.gradle     |   1 +
 .../views-functional-tests/build.gradle            |   1 +
 grails-test-suite-base/build.gradle                |   1 +
 grails-test-suite-persistence/build.gradle         |   1 +
 grails-test-suite-uber/build.gradle                |   1 +
 grails-test-suite-web/build.gradle                 |   1 +
 grails-testing-support-core/build.gradle           |   1 +
 grails-testing-support-datamapping/build.gradle    |   1 +
 grails-testing-support-dbcleanup-core/build.gradle |   1 +
 grails-testing-support-dbcleanup-h2/build.gradle   |   1 +
 .../build.gradle                                   |   1 +
 grails-testing-support-http-client/build.gradle    |   1 +
 grails-testing-support-mongodb/build.gradle        |   1 +
 grails-testing-support-views-gson/build.gradle     |   1 +
 grails-testing-support-web/build.gradle            |   1 +
 grails-url-mappings/build.gradle                   |   1 +
 grails-validation/build.gradle                     |   1 +
 grails-views-core/build.gradle                     |   1 +
 grails-views-gson/build.gradle                     |   1 +
 grails-views-markup/build.gradle                   |   1 +
 grails-web-boot/build.gradle                       |   1 +
 grails-web-common/build.gradle                     |   1 +
 grails-web-core/build.gradle                       |   1 +
 grails-web-databinding/build.gradle                |   1 +
 grails-web-mvc/build.gradle                        |   1 +
 grails-web-url-mappings/build.gradle               |   1 +
 grails-wrapper/build.gradle                        |   1 +
 settings.gradle                                    |   8 +-
 187 files changed, 614 insertions(+), 144 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f08fb9ebf2..21d5d0921d 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -25,6 +25,32 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 jobs:
+  validateDependencies:
+    name: 'Validate Dependency Versions'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v6
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: 17
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        with:
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
+      - name: "🔍 Validate grails-core dependency versions"
+        run: >
+          ./gradlew validateDependencyVersions
+          --continue
+          --stacktrace
+      - name: "🔍 Validate grails-gradle dependency versions"
+        working-directory: 'grails-gradle'
+        run: >
+          ./gradlew validateDependencyVersions
+          --continue
+          --stacktrace
   buildGradle:
     name: 'Build Gradle Plugins'
     strategy:
diff --git a/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy b/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
index 90580cd609..4a45cf4003 100644
--- a/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
+++ b/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
@@ -32,6 +32,7 @@ import org.gradle.api.artifacts.DependencyConstraint
 import org.gradle.api.artifacts.ExcludeRule
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.artifacts.component.ModuleComponentSelector
+import org.gradle.api.artifacts.component.ProjectComponentSelector
 import org.gradle.api.artifacts.result.DependencyResult
 import org.gradle.api.artifacts.result.ResolvedDependencyResult
 import org.gradle.api.file.ConfigurableFileCollection
@@ -188,6 +189,13 @@ abstract class ExtractDependenciesTask extends DefaultTask {
             }
 
             ResolvedDependencyResult dep = (ResolvedDependencyResult) result
+
+            // Skip project dependencies (e.g. platform(project(':grails-bom'))) since their
+            // constraints are already captured through the explicit constraints population
+            if (dep.requested instanceof ProjectComponentSelector) {
+                continue
+            }
+
             ModuleComponentSelector moduleComponentSelector = dep.requested as ModuleComponentSelector
 
             // Any non-constraint via api dependency should *always* be a platform dependency, so expand each of those
@@ -199,6 +207,9 @@ abstract class ExtractDependenciesTask extends DefaultTask {
 
             // fetch the BOM as a pom file so it can be expanded
             ExtractedDependencyConstraint constraint = propertyNameCalculator.calculate(bomCoordinate.groupId, bomCoordinate.artifactId, bomCoordinate.version, true)
+            if(!constraint) {
+                throw new GradleException("Failed to find a property name for BOM dependency: ${bomCoordinate.coordinates}. All platform dependencies must have a property name defined meeting the naming requirements.")
+            }
             constraint.source = bomCoordinate.artifactId
             constraints.put(bomCoordinate.toCoordinateHolder(), constraint)
 
diff --git a/build-logic/plugins/build.gradle b/build-logic/plugins/build.gradle
index 90240300d6..ef5b010fbd 100644
--- a/build-logic/plugins/build.gradle
+++ b/build-logic/plugins/build.gradle
@@ -74,5 +74,9 @@ gradlePlugin {
             id = 'org.apache.grails.buildsrc.repo'
             implementationClass = 'org.apache.grails.buildsrc.GrailsRepoSettingsPlugin'
         }
+        register('grailsDependencyValidator') {
+            id = 'org.apache.grails.buildsrc.dependency-validator'
+            implementationClass = 'org.apache.grails.buildsrc.GrailsDependencyValidatorPlugin'
+        }
     }
 }
\ No newline at end of file
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy
index 84bed197f1..55ac4e38ab 100644
--- a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy
@@ -48,6 +48,10 @@ class GradleUtils {
             def v = findProperty(project, name)
             return v == null ? null : Integer.valueOf(v as String) as T
         }
+        if (type && (type == Boolean || type == boolean.class)) {
+            def v = findProperty(project, name)
+            return v == null ? null : Boolean.parseBoolean(v as String) as T
+        }
 
         findProperty(project, name) as T
     }
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsDependencyValidatorPlugin.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsDependencyValidatorPlugin.groovy
new file mode 100644
index 0000000000..121ed2c4ec
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsDependencyValidatorPlugin.groovy
@@ -0,0 +1,303 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.grails.buildsrc
+
+import groovy.transform.CompileStatic
+
+import org.gradle.api.GradleException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.DependencyConstraint
+import org.gradle.api.artifacts.VersionConstraint
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+import org.gradle.api.artifacts.result.ResolvedComponentResult
+
+/**
+ * Validates that transitive dependencies do not replace versions what the
+ * BOM (grails-bom or grails-gradle-bom) defines. This covers both direct BOM
+ * constraints and inherited platform constraints (e.g., from spring-boot-dependencies).
+ *
+ * <p>The plugin auto-detects which BOM is in use by scanning the project's
+ * dependency declarations. Projects without a BOM are silently skipped.</p>
+ *
+ * <p>Usage: Apply via {@link CompilePlugin} (automatic) or directly, then run
+ * {@code ./gradlew validateDependencyVersions}.</p>
+ */
+@CompileStatic
+class GrailsDependencyValidatorPlugin implements Plugin<Project> {
+
+    static final String VALIDATE_TASK_NAME = 'validateDependencyVersions'
+    /**
+     * Project ext property name that holds a collection of {@code "group:name"} keys
+     * to exempt from version validation. Use this when a deliberate override is applied
+     * (e.g. via {@code resolutionStrategy.useVersion}) and the divergence from the BOM
+     * is intentional.
+     */
+    static final String ALLOWED_OVERRIDES_EXT = 'allowedBomOverrides'
+    private static final Set<String> BOM_PROJECT_NAMES = ['grails-bom', 'grails-gradle-bom'].toSet()
+
+    @Override
+    void apply(Project project) {
+        project.plugins.withId('java') {
+            project.tasks.register(VALIDATE_TASK_NAME) { Task task ->
+                task.group = 'verification'
+                task.description = 'Validates that no transitive dependency upgrades a version beyond what the BOM manages.'
+                task.onlyIf { Task t -> !t.project.hasProperty('skipDependencyValidation') }
+                task.doLast { Task t -> validateDependencies(project) }
+            }
+        }
+    }
+
+    private static void validateDependencies(Project project) {
+        String bomPath = detectBomPath(project)
+        if (bomPath == null) {
+            return
+        }
+
+        String bomName = bomPath.substring(bomPath.lastIndexOf(':') + 1)
+        Set<Configuration> bomConfigurations = findBomConfigurations(project, bomName)
+        if (bomConfigurations.isEmpty()) {
+            return
+        }
+
+        Map<String, String> bomVersions = collectBomVersions(project, bomPath, bomConfigurations)
+        if (bomVersions.isEmpty()) {
+            project.logger.warn('No BOM versions collected for project \'{}\'. Skipping validation.', project.name)
+            return
+        }
+
+        Set<String> allowedOverrides = resolveAllowedOverrides(project)
+        Map<String, String> resolvedVersions = collectResolvedVersions(bomConfigurations)
+        List<String> violations = new ArrayList<>()
+
+        for (Map.Entry<String, String> entry : resolvedVersions.entrySet()) {
+            if (allowedOverrides.contains(entry.key)) {
+                continue
+            }
+            String bomVersion = bomVersions.get(entry.key)
+            if (bomVersion != null && bomVersion != entry.value) {
+                violations.add("  ${entry.key} - resolved ${entry.value}, expected ${bomVersion}" as String)
+            }
+        }
+
+        if (!violations.isEmpty()) {
+            String message = "Dependency version validation failed for project '${project.name}'.\n" +
+                    "The following dependencies resolved to versions different from the BOM (${bomPath}):\n\n" +
+                    violations.join('\n') + '\n\n' +
+                    'A transitive dependency is upgrading these versions.\n' +
+                    'To fix, update the dependency version in dependencies.gradle or add an exclusion in the build file.\n' +
+                    "For intentional overrides, add the coordinate to project.ext.${ALLOWED_OVERRIDES_EXT} (e.g. as a Set<String> of 'group:name' keys)."
+            throw new GradleException(message)
+        }
+    }
+
+    /**
+     * Resolves the set of {@code "group:name"} coordinates the project has marked as
+     * intentional version overrides, via the {@link #ALLOWED_OVERRIDES_EXT} ext property.
+     * Accepts a {@link Collection} or a single {@link CharSequence}. Unknown types are
+     * silently ignored.
+     */
+    private static Set<String> resolveAllowedOverrides(Project project) {
+        if (!project.extensions.extraProperties.has(ALLOWED_OVERRIDES_EXT)) {
+            return Collections.emptySet()
+        }
+        Object raw = project.extensions.extraProperties.get(ALLOWED_OVERRIDES_EXT)
+        if (raw instanceof CharSequence) {
+            return Collections.singleton(raw.toString())
+        }
+        if (raw instanceof Collection) {
+            Set<String> result = new LinkedHashSet<>()
+            for (Object item : (Collection<?>) raw) {
+                if (item != null) {
+                    result.add(item.toString())
+                }
+            }
+            return result
+        }
+        return Collections.emptySet()
+    }
+
+    /**
+     * Scans the project's configurations to find which BOM project is in use.
+     */
+    static String detectBomPath(Project project) {
+        for (Configuration config : project.configurations) {
+            for (Dependency dep : config.dependencies) {
+                if (BOM_PROJECT_NAMES.contains(dep.name)) {
+                    Project bomProject = project.rootProject.findProject(":${dep.name}" as String)
+                    if (bomProject != null) {
+                        return bomProject.path
+                    }
+                }
+            }
+        }
+        null
+    }
+
+    /**
+     * Collects all BOM-managed dependency versions in two phases:
+     * <ol>
+     *   <li>Direct constraints from the BOM project's {@code api} configuration</li>
+     *   <li>Inherited platform constraints (e.g., spring-boot-dependencies) via per-module probing</li>
+     * </ol>
+     */
+    private static Map<String, String> collectBomVersions(Project project, String bomPath, Set<Configuration> bomConfigurations) {
+        Map<String, String> bomVersions = new LinkedHashMap<>()
+
+        // Phase 1: Direct constraints from BOM
+        Project bomProject = project.rootProject.findProject(bomPath)
+        if (bomProject == null) {
+            return bomVersions
+        }
+
+        Configuration bomApi = bomProject.configurations.findByName('api')
+        if (bomApi != null) {
+            for (DependencyConstraint c : bomApi.allDependencyConstraints) {
+                String version = getConstraintVersion(c)
+                if (version != null && !version.isEmpty()) {
+                    bomVersions.put("${c.group}:${c.name}" as String, version)
+                }
+            }
+        }
+
+        // Phase 2: Probe inherited platform constraints for modules not in direct constraints
+        Set<String> resolvedModules = collectAllResolvedModuleKeys(bomConfigurations)
+        Set<String> toProbe = new LinkedHashSet<>(resolvedModules)
+        toProbe.removeAll(bomVersions.keySet())
+
+        if (!toProbe.isEmpty()) {
+            Dependency bomPlatform = project.dependencies.platform(
+                    project.dependencies.project(Collections.singletonMap('path', bomPath))
+            )
+
+            for (String groupModule : toProbe) {
+                try {
+                    Dependency moduleDep = project.dependencies.create(groupModule)
+                    Configuration probe = project.configurations.detachedConfiguration(bomPlatform, moduleDep)
+                    for (ResolvedComponentResult component : probe.incoming.resolutionResult.allComponents) {
+                        if (component.id instanceof ModuleComponentIdentifier) {
+                            ModuleComponentIdentifier mid = (ModuleComponentIdentifier) component.id
+                            String key = "${mid.group}:${mid.module}" as String
+                            if (key == groupModule) {
+                                bomVersions.put(key, mid.version)
+                            }
+                        }
+                    }
+                } catch (Exception ignored) {
+                    // Module not managed by any BOM - skip
+                }
+            }
+        }
+
+        return bomVersions
+    }
+
+    private static String getConstraintVersion(DependencyConstraint constraint) {
+        String version = constraint.version
+        if (version == null || version.isEmpty()) {
+            VersionConstraint vc = constraint.versionConstraint
+            version = vc.requiredVersion
+            if (version == null || version.isEmpty()) {
+                version = vc.strictVersion
+            }
+            if (version == null || version.isEmpty()) {
+                version = vc.preferredVersion
+            }
+        }
+        return version
+    }
+
+    /**
+     * Finds all resolvable configurations that have the BOM in their dependency chain.
+     */
+    private static Set<Configuration> findBomConfigurations(Project project, String bomName) {
+        Set<Configuration> result = new LinkedHashSet<>()
+        for (Configuration config : project.configurations) {
+            if (!config.canBeResolved) {
+                continue
+            }
+            if (configurationHasBom(config, bomName)) {
+                result.add(config)
+            }
+        }
+        return result
+    }
+
+    private static boolean configurationHasBom(Configuration config, String bomName) {
+        return configurationHasBom(config, bomName, new HashSet<String>())
+    }
+
+    private static boolean configurationHasBom(Configuration config, String bomName, Set<String> visited) {
+        if (!visited.add(config.name)) {
+            return false
+        }
+        for (Dependency dep : config.dependencies) {
+            if (dep.name == bomName) {
+                return true
+            }
+        }
+        for (Configuration parent : config.extendsFrom) {
+            if (configurationHasBom(parent, bomName, visited)) {
+                return true
+            }
+        }
+        false
+    }
+
+    /**
+     * Collects the resolved version for each external module across the given configurations.
+     */
+    private static Map<String, String> collectResolvedVersions(Set<Configuration> configurations) {
+        Map<String, String> versions = new LinkedHashMap<>()
+        for (Configuration config : configurations) {
+            try {
+                for (ResolvedComponentResult component : config.incoming.resolutionResult.allComponents) {
+                    if (component.id instanceof ModuleComponentIdentifier) {
+                        ModuleComponentIdentifier mid = (ModuleComponentIdentifier) component.id
+                        versions.put("${mid.group}:${mid.module}" as String, mid.version)
+                    }
+                }
+            } catch (Exception ignored) {
+                // Skip configurations that fail to resolve
+            }
+        }
+        return versions
+    }
+
+    private static Set<String> collectAllResolvedModuleKeys(Set<Configuration> configurations) {
+        Set<String> modules = new LinkedHashSet<>()
+        for (Configuration config : configurations) {
+            try {
+                for (ResolvedComponentResult component : config.incoming.resolutionResult.allComponents) {
+                    if (component.id instanceof ModuleComponentIdentifier) {
+                        ModuleComponentIdentifier mid = (ModuleComponentIdentifier) component.id
+                        modules.add("${mid.group}:${mid.module}" as String)
+                    }
+                }
+            } catch (Exception ignored) {
+                // Skip
+            }
+        }
+        return modules
+    }
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index 2c794452ef..101c8fca0e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -76,7 +76,7 @@ ext {
             'groovy.version'              : '4.0.31',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',
-            'liquibase-hibernate5.version': '4.27.0',
+            'hibernate-groovy-proxy.version': '1.1',
             'mongodb.version'             : '5.5.1',
             'rxjava.version'              : '1.3.8',
             'rxjava2.version'             : '2.2.21',
@@ -136,10 +136,7 @@ ext {
             'groovy-yaml'         : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
             // end - restate the groovy-bom here because the spring dependency management
             'jquery'                   : "org.webjars.npm:jquery:${bomDependencyVersions['jquery.version']}",
-            'liquibase-hibernate5'     : "org.liquibase:liquibase:${bomDependencyVersions['liquibase-hibernate5.version']}",
-            'liquibase-hibernate5-cdi' : "org.liquibase:liquibase-cdi:${bomDependencyVersions['liquibase-hibernate5.version']}",
-            'liquibase-hibernate5-core': "org.liquibase:liquibase-core:${bomDependencyVersions['liquibase-hibernate5.version']}",
-            'liquibase-hibernate5-ext' : "org.liquibase.ext:liquibase-hibernate5:${bomDependencyVersions['liquibase-hibernate5.version']}",
+            'hibernate-groovy-proxy'   : "org.yakworks:hibernate-groovy-proxy:${bomDependencyVersions['hibernate-groovy-proxy.version']}",
             'mongodb-bson'             : "org.mongodb:bson:${bomDependencyVersions['mongodb.version']}",
             'mongodb-driver-core'      : "org.mongodb:mongodb-driver-core:${bomDependencyVersions['mongodb.version']}",
             'mongodb-driver-sync'      : "org.mongodb:mongodb-driver-sync:${bomDependencyVersions['mongodb.version']}",
@@ -156,4 +153,28 @@ ext {
     combinedPlatforms = ['spring-boot-bom': gradleBomPlatformDependencies['spring-boot-bom']] + bomPlatformDependencies
     combinedDependencies = gradleBomDependencies + bomDependencies
     combinedVersions = gradleBomDependencyVersions + bomDependencyVersions
+
+    // Liquibase / Hibernate dependency and version definitions used only for POM property name resolution
+    // by PropertyNameCalculator. The actual dependency constraints are declared directly in the
+    // BOM projects (grails-bom, grails-hibernate5-bom) so consumers of the hibernate5 BOM get the
+    // correct versions without needing to declare them.
+    customBomVersions = [:]
+    customBomDependencies = [:]
+    if (project.name in ['grails-bom', 'grails-hibernate5-bom'] || project.name.startsWith('grails-data-hibernate5')) {
+        customBomVersions = [
+                'liquibase-hibernate.version': '4.27.0',
+                'liquibase.version'          : '4.27.0',
+                'hibernate.version'          : '5.6.15.Final',
+        ]
+        combinedVersions += customBomVersions
+        customBomDependencies = [
+                'liquibase'             : "org.liquibase:liquibase:${combinedVersions['liquibase.version']}",
+                'liquibase-cdi'         : "org.liquibase:liquibase-cdi:${combinedVersions['liquibase.version']}",
+                'liquibase-core'        : "org.liquibase:liquibase-core:${combinedVersions['liquibase.version']}",
+                'liquibase-hibernate'   : "org.liquibase.ext:liquibase-hibernate5:${combinedVersions['liquibase-hibernate.version']}",
+                'hibernate-core-jakarta': "org.hibernate:hibernate-core-jakarta:${combinedVersions['hibernate.version']}",
+                'hibernate-ehcache'     : "org.hibernate:hibernate-ehcache:${combinedVersions['hibernate.version']}",
+        ]
+        combinedDependencies += customBomDependencies
+    }
 }
diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle
index 1b56b0ccb8..ddd75cc1ae 100644
--- a/gradle/publish-root-config.gradle
+++ b/gradle/publish-root-config.gradle
@@ -31,6 +31,7 @@ def publishedProjects = [
         'grails-async-rxjava2',
         'grails-async-rxjava3',
         'grails-bom',
+        'grails-hibernate5-bom',
         'grails-bootstrap',
         'grails-cache',
         'grails-codecs',
diff --git a/gradle/rat-root-config.gradle b/gradle/rat-root-config.gradle
index 00170005c2..b6ba22f53e 100644
--- a/gradle/rat-root-config.gradle
+++ b/gradle/rat-root-config.gradle
@@ -51,6 +51,7 @@ tasks.named('rat') {
             'grails-fields/grails-app/views/templates/_fields/*.gsp', // template files that people are expected to use in the end application
             'grails-geb/src/main/templates/*.groovy', // template files that people are expected to use in the end application
             'grails-doc/src/en/ref/Versions/Grails BOM.adoc', // exclude generated data
+            'grails-doc/src/en/ref/Versions/Grails BOM Hibernate5.adoc', // exclude generated data
             'grails-profiles/**/templates/**', // template files that people are expected to use in the end application
             'grails-profiles/**/commands/**', // template files that people are expected to use in the end application
             'grails-profiles/**/features/**', // template files that people are expected to use in the end application
diff --git a/grails-async/core/build.gradle b/grails-async/core/build.gradle
index 3cc6134b72..cee4816f2e 100644
--- a/grails-async/core/build.gradle
+++ b/grails-async/core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-async/gpars/build.gradle b/grails-async/gpars/build.gradle
index 94c3c5c1ea..8c8d001b26 100644
--- a/grails-async/gpars/build.gradle
+++ b/grails-async/gpars/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-async/plugin/build.gradle b/grails-async/plugin/build.gradle
index 5d3f3bdaa7..b7f0f7188c 100644
--- a/grails-async/plugin/build.gradle
+++ b/grails-async/plugin/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-async/rxjava/build.gradle b/grails-async/rxjava/build.gradle
index dbe559b86f..0bc5e0a8c7 100644
--- a/grails-async/rxjava/build.gradle
+++ b/grails-async/rxjava/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-async/rxjava2/build.gradle b/grails-async/rxjava2/build.gradle
index d9155a1444..1e3d564320 100644
--- a/grails-async/rxjava2/build.gradle
+++ b/grails-async/rxjava2/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-async/rxjava3/build.gradle b/grails-async/rxjava3/build.gradle
index d0ec7a2097..d5c36cb6f4 100644
--- a/grails-async/rxjava3/build.gradle
+++ b/grails-async/rxjava3/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-bom/README.md b/grails-bom/README.md
deleted file mode 100644
index edafad5a59..0000000000
--- a/grails-bom/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-SPDX-License-Identifier: Apache-2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-## grails-bom
-
-Build support for generating the Maven bill of materials.
diff --git a/grails-bom/build.gradle b/grails-bom/base/build.gradle
similarity index 95%
copy from grails-bom/build.gradle
copy to grails-bom/base/build.gradle
index 260239fced..a3b1ddf0c2 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/base/build.gradle
@@ -27,7 +27,6 @@ buildscript {
 
 plugins {
     id 'java-platform'
-    id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
 }
 
@@ -55,6 +54,8 @@ dependencies {
         exclude group: 'org.apache.groovy'
         exclude group: 'org.spockframework'
         exclude group: 'com.fasterxml.jackson'
+        exclude group: 'org.liquibase'
+        exclude group: 'org.hibernate'
     }
 
     for (def entry : bomPlatformDependencies.entrySet()) {
@@ -74,6 +75,11 @@ dependencies {
                 continue // ignore self & test projects
             }
 
+            // skip other java-platform (BOM) projects - they are not library dependencies
+            if (subproject.pluginManager.hasPlugin('java-platform')) {
+                continue
+            }
+
             boolean publishedProject = subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish-profile') || subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish')
             if (!publishedProject) {
                 continue
@@ -86,18 +92,6 @@ dependencies {
         for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
             api "${dependency.value}:${dependency.key}:${projectVersion}"
         }
-
-        // because we are not yet publishing hibernate6, just force the hibernate5 version for now
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
     }
 }
 
diff --git a/grails-bom/build.gradle b/grails-bom/default/build.gradle
similarity index 82%
copy from grails-bom/build.gradle
copy to grails-bom/default/build.gradle
index 260239fced..54885bf69b 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/default/build.gradle
@@ -51,51 +51,31 @@ ext {
 }
 
 dependencies {
-    api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
-        exclude group: 'org.apache.groovy'
-        exclude group: 'org.spockframework'
-        exclude group: 'com.fasterxml.jackson'
-    }
-
-    for (def entry : bomPlatformDependencies.entrySet()) {
-        api platform(entry.value)
-    }
+    api platform(project(':grails-base-bom'))
 
     constraints {
+        // Re-declare base BOM constraints directly so enforcedPlatform() consumers
+        // get forced versions. Constraints inherited via platform() are not enforced
+        // by enforcedPlatform — only direct constraints are.
         for (def entry : gradleBomDependencies.entrySet()) {
             api entry.value
         }
         for (def entry : bomDependencies.entrySet()) {
             api entry.value
         }
-
-        for (Project subproject : rootProject.subprojects) {
-            if (subproject.path == project.path || subproject.name in testProjects || subproject.name in docProjects || subproject.name in cliProjects) {
-                continue // ignore self & test projects
-            }
-
-            boolean publishedProject = subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish-profile') || subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish')
-            if (!publishedProject) {
-                continue
-            }
-
-            api project(":${subproject.path}")
-        }
-
-        // since we're duplicating the bom instead of inheriting we have to add the grails-gradle projects
-        for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
-            api "${dependency.value}:${dependency.key}:${projectVersion}"
-        }
-
-        // because we are not yet publishing hibernate6, just force the hibernate5 version for now
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
+        for (def entry : bomPlatformDependencies.entrySet()) {
+            api entry.value
         }
-        api("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
+        for (def entry : customBomDependencies.entrySet()) {
+            def parts = entry.value.split(':')
+            if (parts.length == 3) {
+                api("${parts[0]}:${parts[1]}") {
+                    version {
+                        strictly parts[2]
+                    }
+                }
+            } else {
+                api entry.value
             }
         }
     }
diff --git a/grails-bom/build.gradle b/grails-bom/hibernate5/build.gradle
similarity index 81%
rename from grails-bom/build.gradle
rename to grails-bom/hibernate5/build.gradle
index 260239fced..48309e15b9 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/hibernate5/build.gradle
@@ -51,51 +51,31 @@ ext {
 }
 
 dependencies {
-    api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
-        exclude group: 'org.apache.groovy'
-        exclude group: 'org.spockframework'
-        exclude group: 'com.fasterxml.jackson'
-    }
-
-    for (def entry : bomPlatformDependencies.entrySet()) {
-        api platform(entry.value)
-    }
+    api platform(project(':grails-bom'))
 
     constraints {
+        // Re-declare base BOM constraints directly so enforcedPlatform() consumers
+        // get forced versions. Constraints inherited via platform() are not enforced
+        // by enforcedPlatform — only direct constraints are.
         for (def entry : gradleBomDependencies.entrySet()) {
             api entry.value
         }
         for (def entry : bomDependencies.entrySet()) {
             api entry.value
         }
-
-        for (Project subproject : rootProject.subprojects) {
-            if (subproject.path == project.path || subproject.name in testProjects || subproject.name in docProjects || subproject.name in cliProjects) {
-                continue // ignore self & test projects
-            }
-
-            boolean publishedProject = subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish-profile') || subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish')
-            if (!publishedProject) {
-                continue
-            }
-
-            api project(":${subproject.path}")
-        }
-
-        // since we're duplicating the bom instead of inheriting we have to add the grails-gradle projects
-        for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
-            api "${dependency.value}:${dependency.key}:${projectVersion}"
-        }
-
-        // because we are not yet publishing hibernate6, just force the hibernate5 version for now
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
+        for (def entry : bomPlatformDependencies.entrySet()) {
+            api entry.value
         }
-        api("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
+        for (def entry : customBomDependencies.entrySet()) {
+            def parts = entry.value.split(':')
+            if (parts.length == 3) {
+                api("${parts[0]}:${parts[1]}") {
+                    version {
+                        strictly parts[2]
+                    }
+                }
+            } else {
+                api entry.value
             }
         }
     }
@@ -110,7 +90,7 @@ configurations.register('bomDependencies').configure {
 tasks.register('extractConstraints', ExtractDependenciesTask).configure { ExtractDependenciesTask it ->
     it.configuration = configurations.named('bomDependencies')
     it.configurationName = 'bomDependencies'
-    it.destination = project.layout.buildDirectory.file('grails-bom-constraints.adoc')
+    it.destination = project.layout.buildDirectory.file('grails-hibernate5-bom-constraints.adoc')
     it.platformDefinitions = combinedPlatforms
     it.definitions = combinedDependencies
     it.projectName = project.name
@@ -179,7 +159,7 @@ if (ext.isReleaseBuild && ext.isPublishedExternal) {
 }
 
 ext {
-    pomDescription = 'Grails BOM (Bill of Materials) for managing dependency versions used by Grails Projects'
+    pomDescription = 'Grails Hibernate 5 BOM (Bill of Materials) for managing dependency versions used by Grails Projects with Hibernate 5'
     pomCustomization = { xml ->
         def root = xml.asNode()
 
diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle
index 22bf226e4f..bda613d68d 100644
--- a/grails-bootstrap/build.gradle
+++ b/grails-bootstrap/build.gradle
@@ -24,6 +24,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-cache/build.gradle b/grails-cache/build.gradle
index be10b6da4b..9d607d16ca 100644
--- a/grails-cache/build.gradle
+++ b/grails-cache/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-codecs-core/build.gradle b/grails-codecs-core/build.gradle
index 1fc3209419..b3b2784913 100644
--- a/grails-codecs-core/build.gradle
+++ b/grails-codecs-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-codecs/build.gradle b/grails-codecs/build.gradle
index 8a530dbf0d..d30dbe2dee 100644
--- a/grails-codecs/build.gradle
+++ b/grails-codecs/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-common/build.gradle b/grails-common/build.gradle
index ed3e95fb73..87ae157af9 100644
--- a/grails-common/build.gradle
+++ b/grails-common/build.gradle
@@ -20,6 +20,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-console/build.gradle b/grails-console/build.gradle
index 4259dec9ee..5f6000c2e5 100644
--- a/grails-console/build.gradle
+++ b/grails-console/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-controllers/build.gradle b/grails-controllers/build.gradle
index 916444c72d..ca0a012542 100644
--- a/grails-controllers/build.gradle
+++ b/grails-controllers/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-converters/build.gradle b/grails-converters/build.gradle
index aa0130a3b9..2df6da086b 100644
--- a/grails-converters/build.gradle
+++ b/grails-converters/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-core/build.gradle b/grails-core/build.gradle
index 101475ebf0..b7e1717a4e 100644
--- a/grails-core/build.gradle
+++ b/grails-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-hibernate5/boot-plugin/build.gradle b/grails-data-hibernate5/boot-plugin/build.gradle
index 93babb9a5f..65ecb9e885 100644
--- a/grails-data-hibernate5/boot-plugin/build.gradle
+++ b/grails-data-hibernate5/boot-plugin/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-hibernate5/core/build.gradle b/grails-data-hibernate5/core/build.gradle
index 4d4469b085..60e5702086 100644
--- a/grails-data-hibernate5/core/build.gradle
+++ b/grails-data-hibernate5/core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
@@ -45,7 +46,7 @@ dependencies {
     api 'org.apache.groovy:groovy'
     api project(':grails-datamapping-core')
     api 'org.springframework:spring-orm'
-    api "org.hibernate:hibernate-core-jakarta:$hibernate5Version", {
+    api 'org.hibernate:hibernate-core-jakarta', {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'com.h2database', module:'h2'
         exclude group:'commons-collections', module:'commons-collections'
@@ -69,12 +70,12 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy-json'
     testImplementation 'org.apache.tomcat:tomcat-jdbc'
     testImplementation 'org.spockframework:spock-core'
-    testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    testImplementation 'org.yakworks:hibernate-groovy-proxy', {
         // groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
 
-    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    testRuntimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-data-hibernate5/dbmigration/build.gradle b/grails-data-hibernate5/dbmigration/build.gradle
index 2dedd85ac7..c4f5c80f2f 100644
--- a/grails-data-hibernate5/dbmigration/build.gradle
+++ b/grails-data-hibernate5/dbmigration/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
@@ -31,20 +32,18 @@ group = 'org.apache.grails'
 
 ext {
     gormApiDocs = true
-    pomTitle = 'Grails Database Migration Plugin'
-    pomDescription = 'The Database Migration plugin helps you manage database changes, via Liquibase, while developing Grails applications'
+    pomTitle = 'Grails Database Migration Plugin for Hibernate 5'
+    pomDescription = 'The Database Migration plugin helps you manage database changes, via Liquibase, while developing Grails applications for Hibernate 5'
 }
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom')) {
-        exclude group: 'org.liquibase', module: 'liquibase-core'
-    }
+    implementation platform(project(':grails-hibernate5-bom'))
 
-    implementation("org.liquibase:liquibase-core:$liquibaseHibernate5Version") {
+    implementation("org.liquibase:liquibase-core") {
         exclude group: 'javax.xml.bind', module: 'jaxb-api'
     }
-    implementation("org.liquibase.ext:liquibase-hibernate5:$liquibaseHibernate5Version") {
+    implementation("org.liquibase.ext:liquibase-hibernate5") {
         exclude group: 'org.hibernate', module: 'hibernate-core'
         exclude group: 'org.hibernate', module: 'hibernate-entitymanager'
         exclude group: 'org.hibernate', module: 'hibernate-envers'
@@ -75,19 +74,6 @@ dependencies {
     testImplementation project(':grails-testing-support-datamapping')
     testImplementation project(':grails-testing-support-web')
     testImplementation 'com.h2database:h2'
-
-    constraints {
-        implementation("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        implementation("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-    }
 }
 
 tasks.named('jar', Jar) {
diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle
index be9c04f90d..cb8da1329e 100644
--- a/grails-data-hibernate5/docs/build.gradle
+++ b/grails-data-hibernate5/docs/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     documentation project(':grails-bootstrap')
     documentation project(':grails-core')
     documentation project(':grails-spring')
-    documentation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
+    documentation 'org.hibernate:hibernate-core-jakarta'
     coreProjects.each {
         documentation "org.apache.grails.data:$it"
     }
diff --git a/grails-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle
index 61d6ffc06f..22fd52fe58 100644
--- a/grails-data-hibernate5/grails-plugin/build.gradle
+++ b/grails-data-hibernate5/grails-plugin/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
@@ -41,7 +42,7 @@ dependencies {
 
     api "org.springframework.boot:spring-boot"
     api "org.springframework:spring-orm"
-    api "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
+    api 'org.hibernate:hibernate-core-jakarta'
     api project(":grails-datastore-web")
     api project(":grails-datamapping-support")
     api project(":grails-data-hibernate5-core"), {
@@ -70,7 +71,7 @@ dependencies {
 
     testRuntimeOnly 'com.h2database:h2'
     testRuntimeOnly 'org.apache.tomcat:tomcat-jdbc'
-    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    testRuntimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-data-mongodb/boot-plugin/build.gradle b/grails-data-mongodb/boot-plugin/build.gradle
index 4a76f19669..7496dd6670 100644
--- a/grails-data-mongodb/boot-plugin/build.gradle
+++ b/grails-data-mongodb/boot-plugin/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-mongodb/bson/build.gradle b/grails-data-mongodb/bson/build.gradle
index 7bbe66e15e..1ac2663ee7 100644
--- a/grails-data-mongodb/bson/build.gradle
+++ b/grails-data-mongodb/bson/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-mongodb/core/build.gradle b/grails-data-mongodb/core/build.gradle
index a23048f3be..f080478090 100644
--- a/grails-data-mongodb/core/build.gradle
+++ b/grails-data-mongodb/core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-mongodb/ext/build.gradle b/grails-data-mongodb/ext/build.gradle
index 2099155492..f8271315be 100644
--- a/grails-data-mongodb/ext/build.gradle
+++ b/grails-data-mongodb/ext/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-mongodb/grails-plugin/build.gradle b/grails-data-mongodb/grails-plugin/build.gradle
index 17bb308104..1ace1bc70d 100644
--- a/grails-data-mongodb/grails-plugin/build.gradle
+++ b/grails-data-mongodb/grails-plugin/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'java-test-fixtures'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-data-mongodb/gson-templates/build.gradle b/grails-data-mongodb/gson-templates/build.gradle
index b9e28625f4..445f6f3676 100644
--- a/grails-data-mongodb/gson-templates/build.gradle
+++ b/grails-data-mongodb/gson-templates/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-data-simple/build.gradle b/grails-data-simple/build.gradle
index 669f97ca60..22567f865c 100644
--- a/grails-data-simple/build.gradle
+++ b/grails-data-simple/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-databinding-core/build.gradle b/grails-databinding-core/build.gradle
index c6af030587..be9a209261 100644
--- a/grails-databinding-core/build.gradle
+++ b/grails-databinding-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-databinding/build.gradle b/grails-databinding/build.gradle
index a4d4f9244b..06d19e9aa1 100644
--- a/grails-databinding/build.gradle
+++ b/grails-databinding/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-async/build.gradle b/grails-datamapping-async/build.gradle
index a5ca830a96..a273194893 100644
--- a/grails-datamapping-async/build.gradle
+++ b/grails-datamapping-async/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-core-test/build.gradle b/grails-datamapping-core-test/build.gradle
index 1b3ea246c1..cf4d0f1cb8 100644
--- a/grails-datamapping-core-test/build.gradle
+++ b/grails-datamapping-core-test/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-core/build.gradle b/grails-datamapping-core/build.gradle
index d2fb1fb690..9eb9a7412c 100644
--- a/grails-datamapping-core/build.gradle
+++ b/grails-datamapping-core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-rx/build.gradle b/grails-datamapping-rx/build.gradle
index 68994ddfb0..202e183902 100644
--- a/grails-datamapping-rx/build.gradle
+++ b/grails-datamapping-rx/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-support/build.gradle b/grails-datamapping-support/build.gradle
index 8784cb08fa..95656e2b87 100644
--- a/grails-datamapping-support/build.gradle
+++ b/grails-datamapping-support/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-tck/build.gradle b/grails-datamapping-tck/build.gradle
index ef7b9244f7..15e7de9509 100644
--- a/grails-datamapping-tck/build.gradle
+++ b/grails-datamapping-tck/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datamapping-validation/build.gradle b/grails-datamapping-validation/build.gradle
index 0b05d45d7d..0748bcffd9 100644
--- a/grails-datamapping-validation/build.gradle
+++ b/grails-datamapping-validation/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datasource/build.gradle b/grails-datasource/build.gradle
index d465cf821f..4f352431f1 100644
--- a/grails-datasource/build.gradle
+++ b/grails-datasource/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datastore-async/build.gradle b/grails-datastore-async/build.gradle
index cd1291a99d..68f9ed6685 100644
--- a/grails-datastore-async/build.gradle
+++ b/grails-datastore-async/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datastore-core/build.gradle b/grails-datastore-core/build.gradle
index bd0e6835e0..8750516d37 100644
--- a/grails-datastore-core/build.gradle
+++ b/grails-datastore-core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-datastore-web/build.gradle b/grails-datastore-web/build.gradle
index 61a07b9b27..138497f193 100644
--- a/grails-datastore-web/build.gradle
+++ b/grails-datastore-web/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-dependencies/assets/build.gradle b/grails-dependencies/assets/build.gradle
index 807a8ddd07..12f33ab1af 100644
--- a/grails-dependencies/assets/build.gradle
+++ b/grails-dependencies/assets/build.gradle
@@ -21,6 +21,7 @@ plugins {
     // Needed for the dependency configurations
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-dependencies/starter-web/build.gradle b/grails-dependencies/starter-web/build.gradle
index 85ce1a055c..46f99f7d15 100644
--- a/grails-dependencies/starter-web/build.gradle
+++ b/grails-dependencies/starter-web/build.gradle
@@ -21,6 +21,7 @@ plugins {
     // Needed for the dependency configurations
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-dependencies/test/build.gradle b/grails-dependencies/test/build.gradle
index 9b4ee0dbe8..17301eab91 100644
--- a/grails-dependencies/test/build.gradle
+++ b/grails-dependencies/test/build.gradle
@@ -21,6 +21,7 @@ plugins {
     // Needed for the dependency configurations
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-doc/build.gradle b/grails-doc/build.gradle
index 6e7af021ad..8e23358bd2 100644
--- a/grails-doc/build.gradle
+++ b/grails-doc/build.gradle
@@ -29,6 +29,7 @@ plugins {
     id 'org.asciidoctor.jvm.convert'
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
 }
 
 compileJava.options.release = javaVersion.toInteger()
diff --git a/grails-domain-class/build.gradle b/grails-domain-class/build.gradle
index 1917f443f3..64016a6fee 100644
--- a/grails-domain-class/build.gradle
+++ b/grails-domain-class/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-encoder/build.gradle b/grails-encoder/build.gradle
index 22c22e773e..5cb654cd2f 100644
--- a/grails-encoder/build.gradle
+++ b/grails-encoder/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/compat/build.gradle b/grails-events/compat/build.gradle
index 9185ef2f97..859b1f005a 100644
--- a/grails-events/compat/build.gradle
+++ b/grails-events/compat/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/core/build.gradle b/grails-events/core/build.gradle
index 31136214f5..0c68efd560 100644
--- a/grails-events/core/build.gradle
+++ b/grails-events/core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/gpars/build.gradle b/grails-events/gpars/build.gradle
index 83565650b3..ad365eceee 100644
--- a/grails-events/gpars/build.gradle
+++ b/grails-events/gpars/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/plugin/build.gradle b/grails-events/plugin/build.gradle
index eeafd94bee..bd69e5ebb6 100644
--- a/grails-events/plugin/build.gradle
+++ b/grails-events/plugin/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/rxjava/build.gradle b/grails-events/rxjava/build.gradle
index 592b3a231b..312477fefa 100644
--- a/grails-events/rxjava/build.gradle
+++ b/grails-events/rxjava/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/rxjava2/build.gradle b/grails-events/rxjava2/build.gradle
index b08a83bdf8..5a107dd924 100644
--- a/grails-events/rxjava2/build.gradle
+++ b/grails-events/rxjava2/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/rxjava3/build.gradle b/grails-events/rxjava3/build.gradle
index 07006522ff..efca93c18d 100644
--- a/grails-events/rxjava3/build.gradle
+++ b/grails-events/rxjava3/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/spring/build.gradle b/grails-events/spring/build.gradle
index d95e5876b9..c568f92623 100644
--- a/grails-events/spring/build.gradle
+++ b/grails-events/spring/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-events/transforms/build.gradle b/grails-events/transforms/build.gradle
index 1d232f9000..778980c095 100644
--- a/grails-events/transforms/build.gradle
+++ b/grails-events/transforms/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-fields/build.gradle b/grails-fields/build.gradle
index cf1dac3f83..1ed72931b9 100644
--- a/grails-fields/build.gradle
+++ b/grails-fields/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.buildsrc.compile'
diff --git a/grails-forge/build.gradle b/grails-forge/build.gradle
index bd7eadc9e1..e427bce710 100644
--- a/grails-forge/build.gradle
+++ b/grails-forge/build.gradle
@@ -24,6 +24,7 @@ import java.time.format.DateTimeFormatter
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
 }
 
 ext {
diff --git a/grails-forge/buildSrc/build.gradle b/grails-forge/buildSrc/build.gradle
index 3aa4f47ff3..ceb4c0704b 100644
--- a/grails-forge/buildSrc/build.gradle
+++ b/grails-forge/buildSrc/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'java-gradle-plugin'
     id 'groovy-gradle-plugin'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
 }
 
 configurations.configureEach {
diff --git a/grails-forge/grails-cli-shadow/build.gradle b/grails-forge/grails-cli-shadow/build.gradle
index ecbd96ca83..6978124d70 100644
--- a/grails-forge/grails-cli-shadow/build.gradle
+++ b/grails-forge/grails-cli-shadow/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'groovy'
     id 'com.gradleup.shadow'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-forge/grails-cli/build.gradle b/grails-forge/grails-cli/build.gradle
index 58ad37096f..eaf424525c 100644
--- a/grails-forge/grails-cli/build.gradle
+++ b/grails-forge/grails-cli/build.gradle
@@ -25,6 +25,7 @@ plugins {
     id 'com.gradleup.shadow'
     id 'io.sdkman.vendors'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-forge/grails-forge-analytics-postgres/build.gradle b/grails-forge/grails-forge-analytics-postgres/build.gradle
index be824be68b..bedb101af1 100644
--- a/grails-forge/grails-forge-analytics-postgres/build.gradle
+++ b/grails-forge/grails-forge-analytics-postgres/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'com.gradleup.shadow'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'io.micronaut.application' version "$micronautApplicationPluginVersion"
 }
 
diff --git a/grails-forge/grails-forge-api/build.gradle b/grails-forge/grails-forge-api/build.gradle
index 91fb090a05..116f5e6e0c 100644
--- a/grails-forge/grails-forge-api/build.gradle
+++ b/grails-forge/grails-forge-api/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-forge/grails-forge-cli/build.gradle b/grails-forge/grails-forge-cli/build.gradle
index 02a699d238..8572b144fb 100644
--- a/grails-forge/grails-forge-cli/build.gradle
+++ b/grails-forge/grails-forge-cli/build.gradle
@@ -24,6 +24,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.grails.forge.rocker'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle
index 84a50c8cca..fedf1a6819 100644
--- a/grails-forge/grails-forge-core/build.gradle
+++ b/grails-forge/grails-forge-core/build.gradle
@@ -23,6 +23,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.grails.forge.rocker'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-forge/grails-forge-web-netty/build.gradle b/grails-forge/grails-forge-web-netty/build.gradle
index f53150b74d..43577700d9 100644
--- a/grails-forge/grails-forge-web-netty/build.gradle
+++ b/grails-forge/grails-forge-web-netty/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'com.gradleup.shadow'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'io.micronaut.application' version "$micronautApplicationPluginVersion"
 }
 
diff --git a/grails-forge/test-core/build.gradle b/grails-forge/test-core/build.gradle
index 4011685591..c898449a5e 100644
--- a/grails-forge/test-core/build.gradle
+++ b/grails-forge/test-core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.grails.forge.rocker'
     id 'org.apache.grails.buildsrc.compile'
 }
diff --git a/grails-geb/build.gradle b/grails-geb/build.gradle
index 8509db9f4b..22f6a9253e 100644
--- a/grails-geb/build.gradle
+++ b/grails-geb/build.gradle
@@ -19,6 +19,7 @@
 plugins {
     id 'java-test-fixtures'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-gradle/bom/build.gradle b/grails-gradle/bom/build.gradle
index d2298cb59e..228b307d58 100644
--- a/grails-gradle/bom/build.gradle
+++ b/grails-gradle/bom/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'java-platform'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
 }
diff --git a/grails-gradle/build.gradle b/grails-gradle/build.gradle
index e7cb03479e..f73da4d626 100644
--- a/grails-gradle/build.gradle
+++ b/grails-gradle/build.gradle
@@ -22,6 +22,7 @@ import java.time.format.DateTimeFormatter
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
 }
 
 allprojects {
diff --git a/grails-gradle/buildSrc/build.gradle b/grails-gradle/buildSrc/build.gradle
index 0813858a74..084f5b09cb 100644
--- a/grails-gradle/buildSrc/build.gradle
+++ b/grails-gradle/buildSrc/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy-gradle-plugin'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
 }
 
 apply {
diff --git a/grails-gradle/common/build.gradle b/grails-gradle/common/build.gradle
index 7262486f44..0adcdb6644 100644
--- a/grails-gradle/common/build.gradle
+++ b/grails-gradle/common/build.gradle
@@ -19,6 +19,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gradle/model/build.gradle b/grails-gradle/model/build.gradle
index 7df57487ca..76e45ba9fd 100644
--- a/grails-gradle/model/build.gradle
+++ b/grails-gradle/model/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gradle/plugins/build.gradle b/grails-gradle/plugins/build.gradle
index cedf995b7a..0c53d94c04 100644
--- a/grails-gradle/plugins/build.gradle
+++ b/grails-gradle/plugins/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-gradle-plugin'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gradle/tasks/build.gradle b/grails-gradle/tasks/build.gradle
index 070e8f475d..a994c5f868 100644
--- a/grails-gradle/tasks/build.gradle
+++ b/grails-gradle/tasks/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/core/build.gradle b/grails-gsp/core/build.gradle
index 1230b95f23..e55a044be7 100644
--- a/grails-gsp/core/build.gradle
+++ b/grails-gsp/core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/grails-layout/build.gradle b/grails-gsp/grails-layout/build.gradle
index f4efaaa78d..32eb8c13c3 100644
--- a/grails-gsp/grails-layout/build.gradle
+++ b/grails-gsp/grails-layout/build.gradle
@@ -19,6 +19,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-gsp/grails-sitemesh3/build.gradle b/grails-gsp/grails-sitemesh3/build.gradle
index ce452e707d..84fc041967 100644
--- a/grails-gsp/grails-sitemesh3/build.gradle
+++ b/grails-gsp/grails-sitemesh3/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-gsp/grails-taglib/build.gradle b/grails-gsp/grails-taglib/build.gradle
index 09d1cfb8b8..55c91cfe45 100644
--- a/grails-gsp/grails-taglib/build.gradle
+++ b/grails-gsp/grails-taglib/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'project-report'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/grails-web-gsp-taglib/build.gradle b/grails-gsp/grails-web-gsp-taglib/build.gradle
index ef42e6b417..869592160c 100644
--- a/grails-gsp/grails-web-gsp-taglib/build.gradle
+++ b/grails-gsp/grails-web-gsp-taglib/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'project-report'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/grails-web-gsp/build.gradle b/grails-gsp/grails-web-gsp/build.gradle
index a151769b6e..f9df4c2edd 100644
--- a/grails-gsp/grails-web-gsp/build.gradle
+++ b/grails-gsp/grails-web-gsp/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'project-report'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/grails-web-jsp/build.gradle b/grails-gsp/grails-web-jsp/build.gradle
index d7ea8a61b9..7776095819 100644
--- a/grails-gsp/grails-web-jsp/build.gradle
+++ b/grails-gsp/grails-web-jsp/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'project-report'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/grails-web-taglib/build.gradle b/grails-gsp/grails-web-taglib/build.gradle
index a340241188..a69196b114 100644
--- a/grails-gsp/grails-web-taglib/build.gradle
+++ b/grails-gsp/grails-web-taglib/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-gsp/plugin/build.gradle b/grails-gsp/plugin/build.gradle
index cc2c269236..767a130825 100644
--- a/grails-gsp/plugin/build.gradle
+++ b/grails-gsp/plugin/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-gsp/spring-boot/build.gradle b/grails-gsp/spring-boot/build.gradle
index 232f940d02..1997530119 100644
--- a/grails-gsp/spring-boot/build.gradle
+++ b/grails-gsp/spring-boot/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.gradle.grails-plugin'
 }
diff --git a/grails-i18n/build.gradle b/grails-i18n/build.gradle
index 115733da09..4ef4fa48b5 100644
--- a/grails-i18n/build.gradle
+++ b/grails-i18n/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-interceptors/build.gradle b/grails-interceptors/build.gradle
index 6f2ef62737..8d7806a80b 100644
--- a/grails-interceptors/build.gradle
+++ b/grails-interceptors/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-logging/build.gradle b/grails-logging/build.gradle
index f3101684d1..4925b3cd92 100644
--- a/grails-logging/build.gradle
+++ b/grails-logging/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-micronaut/build.gradle b/grails-micronaut/build.gradle
index 149838b95b..a2dfd64072 100644
--- a/grails-micronaut/build.gradle
+++ b/grails-micronaut/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-mimetypes/build.gradle b/grails-mimetypes/build.gradle
index 8eb445e854..e315c0a354 100644
--- a/grails-mimetypes/build.gradle
+++ b/grails-mimetypes/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-rest-transforms/build.gradle b/grails-rest-transforms/build.gradle
index 1f903b9283..66866262d2 100644
--- a/grails-rest-transforms/build.gradle
+++ b/grails-rest-transforms/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-scaffolding/build.gradle b/grails-scaffolding/build.gradle
index 0871479ac2..fad0812a90 100644
--- a/grails-scaffolding/build.gradle
+++ b/grails-scaffolding/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.buildsrc.compile'
diff --git a/grails-services/build.gradle b/grails-services/build.gradle
index 417426994f..963ca7642d 100644
--- a/grails-services/build.gradle
+++ b/grails-services/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-shell-cli/build.gradle b/grails-shell-cli/build.gradle
index b53f35a2a5..f2da812af0 100644
--- a/grails-shell-cli/build.gradle
+++ b/grails-shell-cli/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-spring/build.gradle b/grails-spring/build.gradle
index 21322cb0cd..043dd683e5 100644
--- a/grails-spring/build.gradle
+++ b/grails-spring/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-test-core/build.gradle b/grails-test-core/build.gradle
index 6d21f9a0e3..ef3e32d642 100644
--- a/grails-test-core/build.gradle
+++ b/grails-test-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-test-examples/app1/build.gradle b/grails-test-examples/app1/build.gradle
index 943f634bc4..1076caa2e3 100644
--- a/grails-test-examples/app1/build.gradle
+++ b/grails-test-examples/app1/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/app2/build.gradle b/grails-test-examples/app2/build.gradle
index 49d802953f..d0cfa927b3 100644
--- a/grails-test-examples/app2/build.gradle
+++ b/grails-test-examples/app2/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/app3/build.gradle b/grails-test-examples/app3/build.gradle
index 3dd8e624c1..7f0d993c37 100644
--- a/grails-test-examples/app3/build.gradle
+++ b/grails-test-examples/app3/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/async-events-pubsub-demo/build.gradle b/grails-test-examples/async-events-pubsub-demo/build.gradle
index 48adb0a84e..7bda0478bb 100644
--- a/grails-test-examples/async-events-pubsub-demo/build.gradle
+++ b/grails-test-examples/async-events-pubsub-demo/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/cache/build.gradle b/grails-test-examples/cache/build.gradle
index fe0e47eb6c..ae8b3a4531 100644
--- a/grails-test-examples/cache/build.gradle
+++ b/grails-test-examples/cache/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/config-report/build.gradle b/grails-test-examples/config-report/build.gradle
index 231fef7d7d..b141104ee4 100644
--- a/grails-test-examples/config-report/build.gradle
+++ b/grails-test-examples/config-report/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/database-cleanup/build.gradle b/grails-test-examples/database-cleanup/build.gradle
index 08324af9a4..2b5f1119d4 100644
--- a/grails-test-examples/database-cleanup/build.gradle
+++ b/grails-test-examples/database-cleanup/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
@@ -35,7 +36,7 @@ dependencies {
     implementation 'com.h2database:h2'
     implementation 'org.apache.grails:grails-layout'
     implementation 'org.apache.grails:grails-data-hibernate5'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
     runtimeOnly "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
diff --git a/grails-test-examples/datasources/build.gradle b/grails-test-examples/datasources/build.gradle
index 97d7031b03..b8c928826e 100644
--- a/grails-test-examples/datasources/build.gradle
+++ b/grails-test-examples/datasources/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/demo33/build.gradle b/grails-test-examples/demo33/build.gradle
index 716ce7290f..bb76c83be0 100644
--- a/grails-test-examples/demo33/build.gradle
+++ b/grails-test-examples/demo33/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/exploded/build.gradle b/grails-test-examples/exploded/build.gradle
index b2c0c6e25d..6ba321b9c4 100644
--- a/grails-test-examples/exploded/build.gradle
+++ b/grails-test-examples/exploded/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/external-configuration/build.gradle b/grails-test-examples/external-configuration/build.gradle
index 20281d4671..93a078c594 100644
--- a/grails-test-examples/external-configuration/build.gradle
+++ b/grails-test-examples/external-configuration/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/geb-gebconfig/build.gradle b/grails-test-examples/geb-gebconfig/build.gradle
index 2ebe742893..478f62245e 100644
--- a/grails-test-examples/geb-gebconfig/build.gradle
+++ b/grails-test-examples/geb-gebconfig/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/geb/build.gradle b/grails-test-examples/geb/build.gradle
index 55526a65f3..6e2a650fe3 100644
--- a/grails-test-examples/geb/build.gradle
+++ b/grails-test-examples/geb/build.gradle
@@ -19,6 +19,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/gorm/build.gradle b/grails-test-examples/gorm/build.gradle
index 67b9379cbc..5fc38241f3 100644
--- a/grails-test-examples/gorm/build.gradle
+++ b/grails-test-examples/gorm/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
@@ -41,7 +42,7 @@ dependencies {
     }
 
     implementation 'org.apache.grails:grails-data-hibernate5'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/gsp-layout/build.gradle b/grails-test-examples/gsp-layout/build.gradle
index c1e6bb9865..9f129c0d79 100644
--- a/grails-test-examples/gsp-layout/build.gradle
+++ b/grails-test-examples/gsp-layout/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/gsp-sitemesh3/build.gradle b/grails-test-examples/gsp-sitemesh3/build.gradle
index 5cff09fe55..6a0afc4468 100644
--- a/grails-test-examples/gsp-sitemesh3/build.gradle
+++ b/grails-test-examples/gsp-sitemesh3/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/hibernate5/grails-data-service-multi-datasource/build.gradle b/grails-test-examples/hibernate5/grails-data-service-multi-datasource/build.gradle
index 54947de192..5e2f3187ed 100644
--- a/grails-test-examples/hibernate5/grails-data-service-multi-datasource/build.gradle
+++ b/grails-test-examples/hibernate5/grails-data-service-multi-datasource/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.buildsrc.compile'
 }
diff --git a/grails-test-examples/hibernate5/grails-data-service/build.gradle b/grails-test-examples/hibernate5/grails-data-service/build.gradle
index 8fa4c0fdc6..3c630f0751 100644
--- a/grails-test-examples/hibernate5/grails-data-service/build.gradle
+++ b/grails-test-examples/hibernate5/grails-data-service/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gson'
     id 'org.apache.grails.buildsrc.compile'
diff --git a/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle b/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
index 514528fe0e..85e53a201f 100644
--- a/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
+++ b/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle b/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
index e971060edf..34f33f0cfd 100644
--- a/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
+++ b/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.buildsrc.compile'
 }
@@ -31,7 +32,7 @@ dependencies {
 
     implementation 'org.apache.grails:grails-data-hibernate5'
     implementation 'org.apache.grails:grails-core'
-    implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    implementation 'org.yakworks:hibernate-groovy-proxy', {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
 
diff --git a/grails-test-examples/hibernate5/grails-hibernate/build.gradle b/grails-test-examples/hibernate5/grails-hibernate/build.gradle
index 5fff25a861..9233fc1f52 100644
--- a/grails-test-examples/hibernate5/grails-hibernate/build.gradle
+++ b/grails-test-examples/hibernate5/grails-hibernate/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'cloud.wondrify.asset-pipeline'
@@ -54,7 +55,7 @@ dependencies {
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/hibernate5/grails-multiple-datasources/build.gradle b/grails-test-examples/hibernate5/grails-multiple-datasources/build.gradle
index df871d562f..de784dc9ad 100644
--- a/grails-test-examples/hibernate5/grails-multiple-datasources/build.gradle
+++ b/grails-test-examples/hibernate5/grails-multiple-datasources/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.buildsrc.compile'
 }
diff --git a/grails-test-examples/hibernate5/grails-multitenant-multi-datasource/build.gradle b/grails-test-examples/hibernate5/grails-multitenant-multi-datasource/build.gradle
index 54947de192..5e2f3187ed 100644
--- a/grails-test-examples/hibernate5/grails-multitenant-multi-datasource/build.gradle
+++ b/grails-test-examples/hibernate5/grails-multitenant-multi-datasource/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.buildsrc.compile'
 }
diff --git a/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle b/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
index 8cffb59062..72a86f126f 100644
--- a/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
+++ b/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle b/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle
index 2b58a36129..41a4c1a3ff 100644
--- a/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle
+++ b/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-examples/hibernate5/issue450/build.gradle b/grails-test-examples/hibernate5/issue450/build.gradle
index 436ee615f4..ac80fabbf8 100644
--- a/grails-test-examples/hibernate5/issue450/build.gradle
+++ b/grails-test-examples/hibernate5/issue450/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-examples/hibernate5/spring-boot-hibernate/build.gradle b/grails-test-examples/hibernate5/spring-boot-hibernate/build.gradle
index 33619cd297..5cee818132 100644
--- a/grails-test-examples/hibernate5/spring-boot-hibernate/build.gradle
+++ b/grails-test-examples/hibernate5/spring-boot-hibernate/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.springframework.boot'
     id 'org.apache.grails.buildsrc.compile'
 }
diff --git a/grails-test-examples/hibernate5/standalone-hibernate/build.gradle b/grails-test-examples/hibernate5/standalone-hibernate/build.gradle
index 0cc196bf3a..d091bf09eb 100644
--- a/grails-test-examples/hibernate5/standalone-hibernate/build.gradle
+++ b/grails-test-examples/hibernate5/standalone-hibernate/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/hyphenated/build.gradle b/grails-test-examples/hyphenated/build.gradle
index 5c135a3460..87589bf3c3 100644
--- a/grails-test-examples/hyphenated/build.gradle
+++ b/grails-test-examples/hyphenated/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
@@ -49,7 +50,7 @@ dependencies {
     testAndDevelopmentOnly platform(project(':grails-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/issue-11102/build.gradle b/grails-test-examples/issue-11102/build.gradle
index 5dece38a26..9b54a06620 100644
--- a/grails-test-examples/issue-11102/build.gradle
+++ b/grails-test-examples/issue-11102/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/issue-11767/build.gradle b/grails-test-examples/issue-11767/build.gradle
index a2cdd46a07..f88b526512 100644
--- a/grails-test-examples/issue-11767/build.gradle
+++ b/grails-test-examples/issue-11767/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/issue-15228/build.gradle b/grails-test-examples/issue-15228/build.gradle
index d357a733c5..f7da23ca68 100644
--- a/grails-test-examples/issue-15228/build.gradle
+++ b/grails-test-examples/issue-15228/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/issue-698-domain-save-npe/build.gradle b/grails-test-examples/issue-698-domain-save-npe/build.gradle
index d04b263293..4d5c9916c2 100644
--- a/grails-test-examples/issue-698-domain-save-npe/build.gradle
+++ b/grails-test-examples/issue-698-domain-save-npe/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/issue-views-182/build.gradle b/grails-test-examples/issue-views-182/build.gradle
index 0afeab41aa..fc9043e92b 100644
--- a/grails-test-examples/issue-views-182/build.gradle
+++ b/grails-test-examples/issue-views-182/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/micronaut-groovy-only/build.gradle b/grails-test-examples/micronaut-groovy-only/build.gradle
index b9cb39aa8e..b23298c91e 100644
--- a/grails-test-examples/micronaut-groovy-only/build.gradle
+++ b/grails-test-examples/micronaut-groovy-only/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/micronaut/build.gradle b/grails-test-examples/micronaut/build.gradle
index 0e57d69c21..69db765677 100644
--- a/grails-test-examples/micronaut/build.gradle
+++ b/grails-test-examples/micronaut/build.gradle
@@ -20,6 +20,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootArchive
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/mongodb/base/build.gradle b/grails-test-examples/mongodb/base/build.gradle
index 014d4ced57..1b9bf51b22 100644
--- a/grails-test-examples/mongodb/base/build.gradle
+++ b/grails-test-examples/mongodb/base/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/mongodb/database-per-tenant/build.gradle b/grails-test-examples/mongodb/database-per-tenant/build.gradle
index be074be73c..66e4530bea 100644
--- a/grails-test-examples/mongodb/database-per-tenant/build.gradle
+++ b/grails-test-examples/mongodb/database-per-tenant/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/mongodb/gson-templates/build.gradle b/grails-test-examples/mongodb/gson-templates/build.gradle
index 615c7fa8b1..8732c62a55 100644
--- a/grails-test-examples/mongodb/gson-templates/build.gradle
+++ b/grails-test-examples/mongodb/gson-templates/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/mongodb/hibernate5/build.gradle b/grails-test-examples/mongodb/hibernate5/build.gradle
index d6b5189ad5..0622d6258e 100644
--- a/grails-test-examples/mongodb/hibernate5/build.gradle
+++ b/grails-test-examples/mongodb/hibernate5/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
@@ -54,7 +55,7 @@ dependencies {
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-scaffolding'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/mongodb/springboot/build.gradle b/grails-test-examples/mongodb/springboot/build.gradle
index fb23b24419..5855d0b24e 100644
--- a/grails-test-examples/mongodb/springboot/build.gradle
+++ b/grails-test-examples/mongodb/springboot/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/mongodb/test-data-service/build.gradle b/grails-test-examples/mongodb/test-data-service/build.gradle
index 5676de1ea2..3b10e49d9a 100644
--- a/grails-test-examples/mongodb/test-data-service/build.gradle
+++ b/grails-test-examples/mongodb/test-data-service/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/namespaces/build.gradle b/grails-test-examples/namespaces/build.gradle
index f9ca93c46a..99da2a0e3b 100644
--- a/grails-test-examples/namespaces/build.gradle
+++ b/grails-test-examples/namespaces/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/exploded/build.gradle b/grails-test-examples/plugins/exploded/build.gradle
index 2f46e1ab20..c1fd4732c4 100644
--- a/grails-test-examples/plugins/exploded/build.gradle
+++ b/grails-test-examples/plugins/exploded/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/issue-11767/build.gradle b/grails-test-examples/plugins/issue-11767/build.gradle
index 310e26f206..adbe1ca591 100644
--- a/grails-test-examples/plugins/issue-11767/build.gradle
+++ b/grails-test-examples/plugins/issue-11767/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/issue11005/build.gradle b/grails-test-examples/plugins/issue11005/build.gradle
index eef7ccf2df..4b08b455f5 100644
--- a/grails-test-examples/plugins/issue11005/build.gradle
+++ b/grails-test-examples/plugins/issue11005/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/loadafter/build.gradle b/grails-test-examples/plugins/loadafter/build.gradle
index 65151fdeff..f9ef09f690 100644
--- a/grails-test-examples/plugins/loadafter/build.gradle
+++ b/grails-test-examples/plugins/loadafter/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/loadfirst/build.gradle b/grails-test-examples/plugins/loadfirst/build.gradle
index bbaedfef16..ef3ddc7dd2 100644
--- a/grails-test-examples/plugins/loadfirst/build.gradle
+++ b/grails-test-examples/plugins/loadfirst/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/loadsecond/build.gradle b/grails-test-examples/plugins/loadsecond/build.gradle
index 0629410161..52239603e6 100644
--- a/grails-test-examples/plugins/loadsecond/build.gradle
+++ b/grails-test-examples/plugins/loadsecond/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/plugins/micronaut-singleton/build.gradle b/grails-test-examples/plugins/micronaut-singleton/build.gradle
index 61b9398daf..0fc1861438 100644
--- a/grails-test-examples/plugins/micronaut-singleton/build.gradle
+++ b/grails-test-examples/plugins/micronaut-singleton/build.gradle
@@ -18,6 +18,7 @@
  */
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/scaffolding-fields/build.gradle b/grails-test-examples/scaffolding-fields/build.gradle
index 6ba2e6dc07..3afbfc6fcc 100644
--- a/grails-test-examples/scaffolding-fields/build.gradle
+++ b/grails-test-examples/scaffolding-fields/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-examples/scaffolding/build.gradle b/grails-test-examples/scaffolding/build.gradle
index 89b6779c93..1828650189 100644
--- a/grails-test-examples/scaffolding/build.gradle
+++ b/grails-test-examples/scaffolding/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.gradle.grails-web'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-examples/views-functional-tests-plugin/build.gradle b/grails-test-examples/views-functional-tests-plugin/build.gradle
index 6356378ace..5f203e3eee 100644
--- a/grails-test-examples/views-functional-tests-plugin/build.gradle
+++ b/grails-test-examples/views-functional-tests-plugin/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.gradle.grails-gson'
diff --git a/grails-test-examples/views-functional-tests/build.gradle b/grails-test-examples/views-functional-tests/build.gradle
index db349fe0e5..6f744bcaf1 100644
--- a/grails-test-examples/views-functional-tests/build.gradle
+++ b/grails-test-examples/views-functional-tests/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.gradle.grails-web'
     id 'cloud.wondrify.asset-pipeline'
diff --git a/grails-test-suite-base/build.gradle b/grails-test-suite-base/build.gradle
index 72ecc4d140..23bef4896b 100644
--- a/grails-test-suite-base/build.gradle
+++ b/grails-test-suite-base/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.gradle.grails-code-style'
 }
diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
index a73cdf4571..ce251297fc 100644
--- a/grails-test-suite-persistence/build.gradle
+++ b/grails-test-suite-persistence/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle
index aa7b5efeb8..019ff129a0 100644
--- a/grails-test-suite-uber/build.gradle
+++ b/grails-test-suite-uber/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-test-suite-web/build.gradle b/grails-test-suite-web/build.gradle
index 85e128897a..8f2d856bfa 100644
--- a/grails-test-suite-web/build.gradle
+++ b/grails-test-suite-web/build.gradle
@@ -20,6 +20,7 @@
 plugins {
     id 'groovy'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
 }
 
diff --git a/grails-testing-support-core/build.gradle b/grails-testing-support-core/build.gradle
index 7ad1dc8357..cb9b9f5d3f 100644
--- a/grails-testing-support-core/build.gradle
+++ b/grails-testing-support-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-datamapping/build.gradle b/grails-testing-support-datamapping/build.gradle
index 4b4f3097bb..0c03092198 100755
--- a/grails-testing-support-datamapping/build.gradle
+++ b/grails-testing-support-datamapping/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-dbcleanup-core/build.gradle b/grails-testing-support-dbcleanup-core/build.gradle
index e6db9942e8..7368f6dee1 100644
--- a/grails-testing-support-dbcleanup-core/build.gradle
+++ b/grails-testing-support-dbcleanup-core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-dbcleanup-h2/build.gradle b/grails-testing-support-dbcleanup-h2/build.gradle
index 2ca7d1db70..c12e761a30 100644
--- a/grails-testing-support-dbcleanup-h2/build.gradle
+++ b/grails-testing-support-dbcleanup-h2/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-dbcleanup-postgresql/build.gradle b/grails-testing-support-dbcleanup-postgresql/build.gradle
index 0dc8365e19..3644ad1461 100644
--- a/grails-testing-support-dbcleanup-postgresql/build.gradle
+++ b/grails-testing-support-dbcleanup-postgresql/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-http-client/build.gradle b/grails-testing-support-http-client/build.gradle
index 5c83201142..7800604564 100644
--- a/grails-testing-support-http-client/build.gradle
+++ b/grails-testing-support-http-client/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.gradle.grails-code-style'
 }
diff --git a/grails-testing-support-mongodb/build.gradle b/grails-testing-support-mongodb/build.gradle
index 78ec601533..7b5ff0cc62 100644
--- a/grails-testing-support-mongodb/build.gradle
+++ b/grails-testing-support-mongodb/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-views-gson/build.gradle b/grails-testing-support-views-gson/build.gradle
index 901830e6c5..7bfcc80cfe 100644
--- a/grails-testing-support-views-gson/build.gradle
+++ b/grails-testing-support-views-gson/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-testing-support-web/build.gradle b/grails-testing-support-web/build.gradle
index d567f26ef8..385b7bca5d 100755
--- a/grails-testing-support-web/build.gradle
+++ b/grails-testing-support-web/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-url-mappings/build.gradle b/grails-url-mappings/build.gradle
index d100ac9e60..845319ece1 100644
--- a/grails-url-mappings/build.gradle
+++ b/grails-url-mappings/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-validation/build.gradle b/grails-validation/build.gradle
index a9cedaa17f..c129d0695f 100644
--- a/grails-validation/build.gradle
+++ b/grails-validation/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-views-core/build.gradle b/grails-views-core/build.gradle
index b74bd6075c..3da0370d06 100644
--- a/grails-views-core/build.gradle
+++ b/grails-views-core/build.gradle
@@ -21,6 +21,7 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-views-gson/build.gradle b/grails-views-gson/build.gradle
index 9bfc48ca2d..c0781804d2 100644
--- a/grails-views-gson/build.gradle
+++ b/grails-views-gson/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-views-markup/build.gradle b/grails-views-markup/build.gradle
index c16721d6f8..6d6bc3da1b 100644
--- a/grails-views-markup/build.gradle
+++ b/grails-views-markup/build.gradle
@@ -19,6 +19,7 @@
 
 plugins {
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
diff --git a/grails-web-boot/build.gradle b/grails-web-boot/build.gradle
index 0b96337e6e..77f660cc13 100644
--- a/grails-web-boot/build.gradle
+++ b/grails-web-boot/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle
index 8e7d6a83cf..c8db0f9934 100644
--- a/grails-web-common/build.gradle
+++ b/grails-web-common/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-web-core/build.gradle b/grails-web-core/build.gradle
index 14732dda91..5399ca4a2c 100644
--- a/grails-web-core/build.gradle
+++ b/grails-web-core/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-web-databinding/build.gradle b/grails-web-databinding/build.gradle
index 33a18cc594..770a12a4f7 100644
--- a/grails-web-databinding/build.gradle
+++ b/grails-web-databinding/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-web-mvc/build.gradle b/grails-web-mvc/build.gradle
index ce6cfa368b..286f151768 100644
--- a/grails-web-mvc/build.gradle
+++ b/grails-web-mvc/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-web-url-mappings/build.gradle b/grails-web-url-mappings/build.gradle
index 44461d1d85..86d7412532 100644
--- a/grails-web-url-mappings/build.gradle
+++ b/grails-web-url-mappings/build.gradle
@@ -22,6 +22,7 @@ plugins {
     id 'java-library'
     id 'project-report'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/grails-wrapper/build.gradle b/grails-wrapper/build.gradle
index f77c54f12f..136c9bedca 100644
--- a/grails-wrapper/build.gradle
+++ b/grails-wrapper/build.gradle
@@ -19,6 +19,7 @@ plugins {
     id 'groovy'
     id 'distribution'
     id 'org.apache.grails.buildsrc.properties'
+    id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
diff --git a/settings.gradle b/settings.gradle
index 96c711ccbc..8c96263e80 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -111,7 +111,9 @@ include(
         'grails-dependencies-starter-web',
         'grails-dependencies-test',
         'grails-dependencies-assets',
-        'grails-bom',
+        'grails-base-bom', // Not published
+        'grails-bom', // the default bom
+        'grails-hibernate5-bom',
 
         // Docs
         'grails-doc',
@@ -190,6 +192,10 @@ include(
         'grails-micronaut',
 )
 
+project(':grails-bom').projectDir = file('grails-bom/default')
+project(':grails-base-bom').projectDir = file('grails-bom/base')
+project(':grails-hibernate5-bom').projectDir = file('grails-bom/hibernate5')
+
 // Instead of using : to separate nested projects, fix the project directories by setting the projectDir explicitly
 // (Preserve the parent directory name as part of the nested project name)
 project(':grails-events-core').projectDir = file('grails-events/core')