This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 46450a5747 restore correct groupings for grails-bom
46450a5747 is described below
commit 46450a574715808462cd3fb23a2f68eaeb329678
Author: James Daugherty <[email protected]>
AuthorDate: Thu Jan 22 09:22:11 2026 -0500
restore correct groupings for grails-bom
---
grails-bom/build.gradle | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
index f404c895e0..260239fced 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/build.gradle
@@ -43,10 +43,10 @@ ext {
isPublishedExternal =
System.getenv().containsKey('NEXUS_PUBLISH_STAGING_PROFILE_ID')
// TODO: It should be possible to pull these build names using
includedBuild, but I haven't found a way to do so
gradleBuildProjects = [
- 'grails-gradle-plugins',
- 'grails-gradle-model',
- 'grails-gradle-common',
- 'grails-gradle-tasks',
+ 'grails-gradle-plugins':'org.apache.grails',
+ 'grails-gradle-model':'org.apache.grails.gradle',
+ 'grails-gradle-common':'org.apache.grails.gradle',
+ 'grails-gradle-tasks':'org.apache.grails',
]
}
@@ -83,8 +83,8 @@ dependencies {
}
// since we're duplicating the bom instead of inheriting we have to
add the grails-gradle projects
- for (String dependency : project.ext.gradleBuildProjects) {
- api "org.apache.grails.gradle:${dependency}:${projectVersion}"
+ 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
@@ -125,8 +125,8 @@ tasks.register('extractConstraints',
ExtractDependenciesTask).configure { Extrac
artifactIdMappings[p.name] = p.findProperty('pomArtifactId') ?:
p.name
}
- for (String artifactId : project.ext.gradleBuildProjects) {
- artifactIdMappings[artifactId] = artifactId
+ for (Map.Entry<String, String> dependency :
project.ext.gradleBuildProjects.entrySet()) {
+ artifactIdMappings[dependency.key] = dependency.key
}
artifactIdMappings
@@ -141,8 +141,8 @@ tasks.register('extractConstraints',
ExtractDependenciesTask).configure { Extrac
projectCoordinates["${p.group}:${ artifactId}:${p.version}" as
String] = baseVersionName
}
- for (String artifactId : project.ext.gradleBuildProjects) {
-
projectCoordinates["org.apache.grails.gradle:${artifactId}:${project.version}"
as String] = artifactId
+ for (Map.Entry<String, String> dependency :
project.ext.gradleBuildProjects.entrySet()) {
+
projectCoordinates["${dependency.value}:${dependency.key}:${project.version}"
as String] = dependency.key
}
projectCoordinates