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

Upgrade to SnakeYaml 1.31 

Closes gh-32221
This commit is contained in:
Brian Clozel 2022-09-05 14:30:36 +02:00
parent aadfefa5f8
commit 0789dd0eb1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1382,7 +1382,7 @@ bom {
] ]
} }
} }
library("SnakeYAML", "1.30") { library("SnakeYAML", "1.31") {
group("org.yaml") { group("org.yaml") {
modules = [ modules = [
"snakeyaml" "snakeyaml"

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java vendored
View File

@ -75,7 +75,7 @@ class OriginTrackedYamlLoader extends YamlProcessor {
BaseConstructor constructor = new OriginTrackingConstructor(loaderOptions); BaseConstructor constructor = new OriginTrackingConstructor(loaderOptions);
Representer representer = new Representer(); Representer representer = new Representer();
DumperOptions dumperOptions = new DumperOptions(); DumperOptions dumperOptions = new DumperOptions();
LimitedResolver resolver = new LimitedResolver(); NoTimestampResolver resolver = new NoTimestampResolver();
return new Yaml(constructor, representer, dumperOptions, loaderOptions, resolver); return new Yaml(constructor, representer, dumperOptions, loaderOptions, resolver);
} }
@ -167,14 +167,14 @@ class OriginTrackedYamlLoader extends YamlProcessor {
/** /**
* {@link Resolver} that limits {@link Tag#TIMESTAMP} tags. * {@link Resolver} that limits {@link Tag#TIMESTAMP} tags.
*/ */
private static class LimitedResolver extends Resolver { private static class NoTimestampResolver extends Resolver {
@Override @Override
public void addImplicitResolver(Tag tag, Pattern regexp, String first) { public void addImplicitResolver(Tag tag, Pattern regexp, String first, int limit) {
if (tag == Tag.TIMESTAMP) { if (tag == Tag.TIMESTAMP) {
return; return;
} }
super.addImplicitResolver(tag, regexp, first); super.addImplicitResolver(tag, regexp, first, limit);
} }
} }