root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter

This commit is contained in:
Andy Wilkinson 2022-09-05 11:46:23 +01:00 committed by Brian Clozel
parent 7b12926d8c
commit d9265f0a92
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View File

@ -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));
}

7
spring-boot-project/spring-boot-parent/build.gradle
View File

@ -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 = [