diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java index b3e6377b3de..decff985cae 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java @@ -231,9 +231,11 @@ class JavaConventions { .matching((configuration) -> configuration.getName().endsWith("Classpath") || JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.equals(configuration.getName())) .all((configuration) -> configuration.extendsFrom(dependencyManagement)); - Dependency springBootParent = project.getDependencies().enforcedPlatform(project.getDependencies() - .project(Collections.singletonMap("path", ":spring-boot-project:spring-boot-parent"))); - dependencyManagement.getDependencies().add(springBootParent); + String path = project.getName().contains("spring-boot-starter") + ? ":spring-boot-project:spring-boot-dependencies" : ":spring-boot-project:spring-boot-parent"; + Dependency dependency = project.getDependencies() + .enforcedPlatform(project.getDependencies().project(Collections.singletonMap("path", path))); + dependencyManagement.getDependencies().add(dependency); project.getPlugins().withType(OptionalDependenciesPlugin.class, (optionalDependencies) -> configurations .getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME).extendsFrom(dependencyManagement)); } diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 99a7a241c95..8e68db4844d 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -164,6 +164,13 @@ bom { ] } } + library("SnakeYAML", "1.31") { + group("org.yaml") { + modules = [ + "snakeyaml" + ] + } + } library("Spock Framework", "2.0-groovy-3.0") { group("org.spockframework") { modules = [