From f73d86e700d82229cd67ccb8fd2acd80bd494346 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 10 Jun 2015 13:29:34 +0100
Subject: [PATCH] Upgrade to Elasticsearch 1.5.2

Closes gh-3194
---
 .../actuate/health/ElasticsearchHealthIndicatorTests.java | 8 +++++++-
 spring-boot-dependencies/pom.xml                          | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
index 9f8c4d13ed9..4f7f529e3f3 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
@@ -28,6 +28,10 @@ import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.client.AdminClient;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ClusterAdminClient;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.block.ClusterBlocks;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.cluster.routing.RoutingTable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -175,7 +179,9 @@ public class ElasticsearchHealthIndicatorTests {
 		}
 
 		private StubClusterHealthResponse(ClusterHealthStatus status) {
-			super("test-cluster", null);
+			super("test-cluster", new String[0], new ClusterState(null, 0, null,
+					RoutingTable.builder().build(), DiscoveryNodes.builder().build(),
+					ClusterBlocks.builder().build(), null));
 			this.status = status;
 		}
 
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index a1f5056745d..1231dae769a 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -65,7 +65,7 @@
 		<flyway.version>3.2.1</flyway.version>
 		<freemarker.version>2.3.22</freemarker.version>
 		<ecj.version>4.4.2</ecj.version>
-		<elasticsearch.version>1.4.5</elasticsearch.version>
+		<elasticsearch.version>1.5.2</elasticsearch.version>
 		<gemfire.version>8.0.0</gemfire.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>1.12</gradle.version>