Solve BOM existential crisis - Fixes #15258

build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/PropertyNameCalculator.groovy

@@ -28,6 +28,8 @@ import org.gradle.api.plugins.JavaPlatformPlugin
  */
 class PropertyNameCalculator {
 
+    static final String GRAILS_VERSION_PROPERTY = 'grails.version'
+
     final Map<String, String> keysToPlatformCoordinates = [:]
     final Map<String, ExtractedDependencyConstraint> platformDefinitions = [:]
 
@@ -41,22 +43,21 @@ class PropertyNameCalculator {
         this.versions.putAll(definitionVersions)
     }
 
-    void addProjects(Collection<Project> projects) {
+    void addProjects(Collection<Project> projects, String grailsVersion) {
+        versions.put(GRAILS_VERSION_PROPERTY, grailsVersion)
+
         for (Project project : projects) {
             if (project.plugins.hasPlugin(JavaPlatformPlugin) || !project.extensions.findByName('grailsPublish')) {
                 continue
             }
 
             String artifactId = (project.findProperty('pomArtifactId') ?: project.name)
-            String baseVersionName = artifactId.replaceAll('-', '.')
-            String versionName = "${baseVersionName}.version" as String
             String coordinates = "${project.group}:${artifactId}:${project.version}" as String
             ExtractedDependencyConstraint constraint = new ExtractedDependencyConstraint(coordinates as String)
-            constraint.versionPropertyReference = "\${${versionName}}" as String
+            constraint.versionPropertyReference = "\${${GRAILS_VERSION_PROPERTY}}" as String
 
             definitions.put(coordinates, constraint)
-            keysToCoordinates.put(coordinates, baseVersionName)
-            versions.put(versionName, project.version as String)
+            keysToCoordinates.put(coordinates, 'grails')
         }
     }
 

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PublishPlugin.groovy

@@ -183,12 +183,17 @@ class PublishPlugin implements Plugin<Project> {
                 it.url.set('https://apache.org/')
             }
             it.developers.set(project.provider { lookupProperty(project, 'pomDevelopers', determineDevelopers(project))})
-            it.pomCustomization = lookupProperty(project, 'pomCustomization') as Closure
             it.publishTestSources.set(project.provider { lookupProperty(project, 'pomPublishTestSources', false)})
             it.testRepositoryPath.set(project.provider { shouldSkipJavaComponent(project) ? null : findRootGrailsCoreDir(project).dir('build/local-maven')})
             it.publicationName.set(project.provider { lookupProperty(project, 'pomMavenPublicationName', 'maven')})
             it.addComponents.set(project.provider { !shouldSkipJavaComponent(project) && !project.pluginManager.hasPlugin('java-gradle-plugin')})
         }
+
+        project.afterEvaluate {
+            project.extensions.configure(GrailsPublishExtension) {
+                it.pomCustomization = lookupProperty(project, 'pomCustomization') as Closure
+            }
+        }
     }
 
     private static void ensureJarContainsASFFiles(Project project) {

grails-bom/build.gradle

@@ -20,6 +20,7 @@
 import org.apache.grails.gradle.tasks.bom.ExtractDependenciesTask
 import org.apache.grails.gradle.tasks.bom.ExtractedDependencyConstraint
 import org.apache.grails.gradle.tasks.bom.PropertyNameCalculator
+import org.gradle.api.publish.tasks.GenerateModuleMetadata
 
 buildscript {
     apply from: rootProject.layout.projectDirectory.file('dependencies.gradle')
@@ -39,6 +40,12 @@ javaPlatform {
     allowDependencies()
 }
 
+// Disable Gradle Module Metadata (.module files) for the BOM
+// This allows properties to be overridden with the Spring dependency management plugin
+tasks.withType(GenerateModuleMetadata).configureEach {
+    enabled = false
+}
+
 ext {
     isReleaseBuild = System.getenv('GRAILS_PUBLISH_RELEASE') == 'true'
     isPublishedExternal = System.getenv().containsKey('NEXUS_PUBLISH_STAGING_PROFILE_ID')
@@ -160,6 +167,9 @@ ext {
         def deps = depMgmt?.dependencies?.getAt(0)
         if (deps) {
             Map<String, String> pomProperties = [:]
+            PropertyNameCalculator propertyNameCalculator = new PropertyNameCalculator(combinedPlatforms, combinedDependencies, combinedVersions)
+            propertyNameCalculator.addProjects(rootProject.subprojects, projectVersion)
+
             deps.dependency.each { dep ->
                 String groupId = dep.groupId.text().trim()
                 String artifactId = dep.artifactId.text().trim()
@@ -171,8 +181,6 @@ ext {
                 }
 
                 if (inlineVersion) {
-                    PropertyNameCalculator propertyNameCalculator = new PropertyNameCalculator(combinedPlatforms, combinedDependencies, combinedVersions)
-                    propertyNameCalculator.addProjects(rootProject.subprojects)
                     ExtractedDependencyConstraint extractedConstraint = propertyNameCalculator.calculate(groupId, artifactId, inlineVersion, isBom)
                     if (extractedConstraint?.versionPropertyReference) {
                         // use the property reference instead of the hard coded version so that it can be
@@ -183,18 +191,17 @@ ext {
                         pomProperties.put(extractedConstraint.versionPropertyName, inlineVersion)
                     }
 
-                    if (gradle.includedBuilds*.any { it.name == artifactId && groupId.startsWith('org.apache.grails') }) {
-                        String baseVersionName = artifactId.replaceAll('-', '.')
-                        String versionName = "${baseVersionName}.version" as String
-                        dep.version[0].value = "\${${versionName}}" as String
-                        pomProperties.put(versionName, inlineVersion)
+                    // For included builds (grails-gradle), also use grails.version
+                    if (gradle.includedBuilds.any { it.name == artifactId && groupId.startsWith('org.apache.grails') }) {
+                        dep.version[0].value = "\${${PropertyNameCalculator.GRAILS_VERSION_PROPERTY}}" as String
+                        pomProperties.put(PropertyNameCalculator.GRAILS_VERSION_PROPERTY, inlineVersion)
                     }
                 } else if (!inlineVersion) {
                     throw new GradleException("Dependency $groupId:$artifactId does not have a version.")
                 }
             }
 
-            for (Map.Entry<String, String> property : pomProperties.entrySet()) {
+            for (Map.Entry<String, String> property : pomProperties.sort().entrySet()) {
                 propertiesNode.appendNode(property.key, property.value)
             }
         }