Browse Source

Merge pull request #14224 from asomov:update-snakeyaml-to-1-23

* pr/14224:
  Upgrade to SnakeYAML 1.23
pull/14173/merge
Stephane Nicoll 8 years ago
parent
commit
1399c2cb3c
  1. 2
      spring-boot-project/spring-boot-dependencies/pom.xml
  2. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java

2
spring-boot-project/spring-boot-dependencies/pom.xml

@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
<sendgrid.version>4.2.1</sendgrid.version>
<servlet-api.version>4.0.1</servlet-api.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.21</snakeyaml.version>
<snakeyaml.version>1.23</snakeyaml.version>
<solr.version>7.4.0</solr.version>
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.1.0.M2</spring-amqp.version>

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java vendored

@ -124,7 +124,7 @@ class OriginTrackedYamlLoader extends YamlProcessor { @@ -124,7 +124,7 @@ class OriginTrackedYamlLoader extends YamlProcessor {
KeyScalarNode(ScalarNode node) {
super(node.getTag(), node.getValue(), node.getStartMark(), node.getEndMark(),
node.getStyle());
node.getScalarStyle());
}
public static NodeTuple get(NodeTuple nodeTuple) {

Loading…
Cancel
Save