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

pull/32501/head
Andy Wilkinson 2 years ago committed by Brian Clozel
parent 7b12926d8c
commit d9265f0a92

@ -231,9 +231,11 @@ class JavaConventions {
.matching((configuration) -> configuration.getName().endsWith("Classpath") .matching((configuration) -> configuration.getName().endsWith("Classpath")
|| JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.equals(configuration.getName())) || JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.equals(configuration.getName()))
.all((configuration) -> configuration.extendsFrom(dependencyManagement)); .all((configuration) -> configuration.extendsFrom(dependencyManagement));
Dependency springBootParent = project.getDependencies().enforcedPlatform(project.getDependencies() String path = project.getName().contains("spring-boot-starter")
.project(Collections.singletonMap("path", ":spring-boot-project:spring-boot-parent"))); ? ":spring-boot-project:spring-boot-dependencies" : ":spring-boot-project:spring-boot-parent";
dependencyManagement.getDependencies().add(springBootParent); Dependency dependency = project.getDependencies()
.enforcedPlatform(project.getDependencies().project(Collections.singletonMap("path", path)));
dependencyManagement.getDependencies().add(dependency);
project.getPlugins().withType(OptionalDependenciesPlugin.class, (optionalDependencies) -> configurations project.getPlugins().withType(OptionalDependenciesPlugin.class, (optionalDependencies) -> configurations
.getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME).extendsFrom(dependencyManagement)); .getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME).extendsFrom(dependencyManagement));
} }

@ -164,6 +164,13 @@ bom {
] ]
} }
} }
library("SnakeYAML", "1.31") {
group("org.yaml") {
modules = [
"snakeyaml"
]
}
}
library("Spock Framework", "2.0-groovy-3.0") { library("Spock Framework", "2.0-groovy-3.0") {
group("org.spockframework") { group("org.spockframework") {
modules = [ modules = [

Loading…
Cancel
Save