Skip to content

Commit 86a3099

Browse files
committed
Align ExtractVersionConstraints with 3.2.x
See gh-40551
1 parent 308b0d9 commit 86a3099

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

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

+9-7
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import java.util.TreeSet;
2727

2828
import org.gradle.api.DefaultTask;
29+
import org.gradle.api.Project;
2930
import org.gradle.api.Task;
3031
import org.gradle.api.artifacts.ComponentMetadataDetails;
3132
import org.gradle.api.artifacts.Configuration;
32-
import org.gradle.api.artifacts.Dependency;
3333
import org.gradle.api.artifacts.DependencyConstraint;
3434
import org.gradle.api.artifacts.DependencyConstraintMetadata;
3535
import org.gradle.api.artifacts.DependencyConstraintSet;
@@ -69,13 +69,15 @@ public ExtractVersionConstraints() {
6969
}
7070

7171
public void enforcedPlatform(String projectPath) {
72-
Dependency project = getProject().getDependencies().project(Map.of("path", projectPath));
73-
Dependency dependency = getProject().getDependencies().enforcedPlatform(project);
74-
this.configuration.getDependencies().add(dependency);
75-
getProject().getPlugins().withType(BomPlugin.class).all((plugin) -> {
76-
this.boms.add(getProject().getExtensions().getByType(BomExtension.class));
72+
this.configuration.getDependencies()
73+
.add(getProject().getDependencies()
74+
.enforcedPlatform(
75+
getProject().getDependencies().project(Collections.singletonMap("path", projectPath))));
76+
Project project = getProject().project(projectPath);
77+
project.getPlugins().withType(BomPlugin.class).all((plugin) -> {
78+
this.boms.add(project.getExtensions().getByType(BomExtension.class));
7779
this.dependencyConstraintSets
78-
.add(getProject().getConfigurations().getByName("apiElements").getAllDependencyConstraints());
80+
.add(project.getConfigurations().getByName("apiElements").getAllDependencyConstraints());
7981
});
8082
}
8183

0 commit comments

Comments
 (0)