From 234804745033017a223db240ae4fd0dc95f70b39 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 3 Jul 2018 13:46:12 +0100
Subject: [PATCH] Upgrade to Elasticsearch 6.3.0

Closes gh-13671
---
 spring-boot-project/spring-boot-autoconfigure/pom.xml | 5 +++++
 spring-boot-project/spring-boot-dependencies/pom.xml  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
index b731062d0c..ad95125bec 100755
--- a/spring-boot-project/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -750,6 +750,11 @@
 			<artifactId>johnzon-jsonb</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-jasper</artifactId>
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index cdb4e509e7..3152c662c9 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -60,7 +60,7 @@
 		<embedded-mongo.version>2.1.1</embedded-mongo.version>
 		<flyway.version>5.0.7</flyway.version>
 		<freemarker.version>2.3.28</freemarker.version>
-		<elasticsearch.version>6.2.4</elasticsearch.version>
+		<elasticsearch.version>6.3.0</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<groovy.version>2.5.0</groovy.version>
 		<gson.version>2.8.5</gson.version>