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

snicoll · snicoll · commit 1399c2cb3cce · 2018-08-30T11:33:48.000+02:00
* pr/14224:
  Upgrade to SnakeYAML 1.23
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -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>
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java
@@ -124,7 +124,7 @@ private static class KeyScalarNode extends ScalarNode {
 
 		KeyScalarNode(ScalarNode node) {
 			super(node.getTag(), node.getValue(), node.getStartMark(), node.getEndMark(),
-					node.getStyle());
+					node.getScalarStyle());
 		}
 
 		public static NodeTuple get(NodeTuple nodeTuple) {

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private static class KeyScalarNode extends ScalarNode {`
`124`	`124`
`125`	`125`	`KeyScalarNode(ScalarNode node) {`
`126`	`126`	`super(node.getTag(), node.getValue(), node.getStartMark(), node.getEndMark(),`
`127`		`- node.getStyle());`
	`127`	`+ node.getScalarStyle());`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public static NodeTuple get(NodeTuple nodeTuple) {`