From 9712bb62fdc772144c1876e5210eeec77c31e026 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 12 Dec 2022 14:57:51 +0100 Subject: [PATCH] Upgrade optional dependencies --- framework-platform/framework-platform.gradle | 6 +++--- .../springframework/beans/factory/config/YamlProcessor.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 7c8399884b..697b52487b 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -29,7 +29,7 @@ dependencies { api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") api("com.google.code.gson:gson:2.10") - api("com.google.protobuf:protobuf-java-util:3.21.10") + api("com.google.protobuf:protobuf-java-util:3.21.11") api("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") api("com.h2database:h2:2.1.214") api("com.jayway.jsonpath:json-path:2.7.0") @@ -45,7 +45,7 @@ dependencies { api("com.thoughtworks.xstream:xstream:1.4.19") api("commons-io:commons-io:2.11.0") api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") - api("info.picocli:picocli:4.6.3") + api("info.picocli:picocli:4.7.0") api("io.micrometer:context-propagation:1.0.0") api("io.mockk:mockk:1.12.1") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") @@ -143,6 +143,6 @@ dependencies { api("org.webjars:webjars-locator-core:0.52") api("org.xmlunit:xmlunit-assertj:2.9.0") api("org.xmlunit:xmlunit-matchers:2.9.0") - api("org.yaml:snakeyaml:1.30") + api("org.yaml:snakeyaml:1.33") } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 536b597e6d..01a3ddcde5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -184,8 +184,9 @@ public abstract class YamlProcessor { protected Yaml createYaml() { LoaderOptions loaderOptions = new LoaderOptions(); loaderOptions.setAllowDuplicateKeys(false); - return new Yaml(new FilteringConstructor(loaderOptions), new Representer(), - new DumperOptions(), loaderOptions); + DumperOptions dumperOptions = new DumperOptions(); + return new Yaml(new FilteringConstructor(loaderOptions), new Representer(dumperOptions), + dumperOptions, loaderOptions); } private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {