Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Align ExtractVersionConstraints with 3.2.x

Browse Source 
See gh-40551
This commit is contained in:
Andy Wilkinson 2024-04-26 17:47:30 +01:00
parent 308b0d9921
commit 86a3099782
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java
View File

@ -26,10 +26,10 @@ import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.Project;
import org.gradle.api.Task; import org.gradle.api.Task;
import org.gradle.api.artifacts.ComponentMetadataDetails; import org.gradle.api.artifacts.ComponentMetadataDetails;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.DependencyConstraint; import org.gradle.api.artifacts.DependencyConstraint;
import org.gradle.api.artifacts.DependencyConstraintMetadata; import org.gradle.api.artifacts.DependencyConstraintMetadata;
import org.gradle.api.artifacts.DependencyConstraintSet; import org.gradle.api.artifacts.DependencyConstraintSet;
@ -69,13 +69,15 @@ public class ExtractVersionConstraints extends DefaultTask {
} }
public void enforcedPlatform(String projectPath) { public void enforcedPlatform(String projectPath) {
Dependency project = getProject().getDependencies().project(Map.of("path", projectPath)); this.configuration.getDependencies()
Dependency dependency = getProject().getDependencies().enforcedPlatform(project); .add(getProject().getDependencies()
this.configuration.getDependencies().add(dependency); .enforcedPlatform(
getProject().getPlugins().withType(BomPlugin.class).all((plugin) -> { getProject().getDependencies().project(Collections.singletonMap("path", projectPath))));
this.boms.add(getProject().getExtensions().getByType(BomExtension.class)); Project project = getProject().project(projectPath);
project.getPlugins().withType(BomPlugin.class).all((plugin) -> {
this.boms.add(project.getExtensions().getByType(BomExtension.class));
this.dependencyConstraintSets this.dependencyConstraintSets
.add(getProject().getConfigurations().getByName("apiElements").getAllDependencyConstraints()); .add(project.getConfigurations().getByName("apiElements").getAllDependencyConstraints());
}); });
} }