From 46c30d01e95964c4ae66a63c6a60e2cf00118e19 Mon Sep 17 00:00:00 2001
From: asomov <public.somov@gmail.com>
Date: Tue, 28 Aug 2018 15:22:43 +0200
Subject: [PATCH] Upgrade to SnakeYAML 1.23

Closes gh-14224
---
 spring-boot-project/spring-boot-dependencies/pom.xml            | 2 +-
 .../org/springframework/boot/env/OriginTrackedYamlLoader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 8868b75aaa4..5955482a7cb 100644
--- 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
index 9132e0e19da..83020910005 100644
--- 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 @@ 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) {