From decf234b882521eb54692ec40a194eb666fbd9a4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 29 Oct 2024 15:22:12 +0000 Subject: [PATCH] Move away from ProjectDependency#getDependencyProject() Closes gh-42870 --- .../boot/build/MavenRepositoryPlugin.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java index 258a4ef8dd6..1cd9570d30d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java @@ -17,8 +17,6 @@ package org.springframework.boot.build; import java.io.File; -import java.util.HashMap; -import java.util.Map; import org.gradle.api.Action; import org.gradle.api.Plugin; @@ -97,10 +95,11 @@ public class MavenRepositoryPlugin implements Plugin { .getDependencies() .withType(ProjectDependency.class) .all((dependency) -> { - Map dependencyDescriptor = new HashMap<>(); - dependencyDescriptor.put("path", dependency.getDependencyProject().getPath()); - dependencyDescriptor.put("configuration", MAVEN_REPOSITORY_CONFIGURATION_NAME); - target.add(project.getDependencies().project(dependencyDescriptor)); + ProjectDependency copy = dependency.copy(); + if (copy.getAttributes().isEmpty()) { + copy.setTargetConfiguration(MAVEN_REPOSITORY_CONFIGURATION_NAME); + } + target.add(copy); }); }