This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch wrapper-profiles-merge
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/wrapper-profiles-merge by this
push:
new 7e26da6cb7 Improve the extract dependencies task to look for
pomArtifactId to match the project's published artifact id
7e26da6cb7 is described below
commit 7e26da6cb7ad759eaf12aed33ed00a0b9d5e860a
Author: James Daugherty <[email protected]>
AuthorDate: Wed Apr 30 19:57:15 2025 -0400
Improve the extract dependencies task to look for pomArtifactId to match
the project's published artifact id
---
.../apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy | 7 +++++++
1 file changed, 7 insertions(+)
diff --git
a/grails-gradle/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
b/grails-gradle/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
index 44aa1481a1..f898b0d291 100644
---
a/grails-gradle/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
+++
b/grails-gradle/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
@@ -30,6 +30,7 @@ import org.gradle.api.artifacts.result.DependencyResult
import org.gradle.api.artifacts.result.ResolvedDependencyResult
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.RegularFileProperty
+import
org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependencyConstraint
import org.gradle.api.provider.MapProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.*
@@ -125,6 +126,12 @@ abstract class ExtractDependenciesTask extends DefaultTask
{
String artifactId = constraint.module.name as String
String artifactVersion = constraint.version as String
+ //TODO: need to look for project property ? or manually find the
project?
+ if (constraint instanceof DefaultProjectDependencyConstraint) {
+ DefaultProjectDependencyConstraint pConstraint =
(DefaultProjectDependencyConstraint) constraint
+ artifactId =
pConstraint.projectDependency.dependencyProject.findProperty('pomArtifactId')
?: artifactId
+ }
+
ExtractedDependencyConstraint extractConstraint =
propertyNameCalculator.calculate(groupId, artifactId, artifactVersion, false)
?: new ExtractedDependencyConstraint(groupId: groupId, artifactId: artifactId,
version: artifactVersion)
extractConstraint.source = project.name
constraints.put(new CoordinateHolder(groupId:
extractConstraint.groupId, artifactId: extractConstraint.artifactId),
extractConstraint)
