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

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

* pr/14224:
  Upgrade to SnakeYAML 1.23
This commit is contained in:
Stephane Nicoll 2018-08-30 11:33:48 +02:00
parent 0590c4de32 46c30d01e9
commit 1399c2cb3c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
View File

@ -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) {