Commit f73d86e7 authored by Andy Wilkinson's avatar Andy Wilkinson

Upgrade to Elasticsearch 1.5.2

Closes gh-3194
parent ae64d84b
...@@ -28,6 +28,10 @@ import org.elasticsearch.action.support.PlainActionFuture; ...@@ -28,6 +28,10 @@ import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.client.AdminClient; import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.client.ClusterAdminClient; 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.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -175,7 +179,9 @@ public class ElasticsearchHealthIndicatorTests { ...@@ -175,7 +179,9 @@ public class ElasticsearchHealthIndicatorTests {
} }
private StubClusterHealthResponse(ClusterHealthStatus status) { 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; this.status = status;
} }
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<flyway.version>3.2.1</flyway.version> <flyway.version>3.2.1</flyway.version>
<freemarker.version>2.3.22</freemarker.version> <freemarker.version>2.3.22</freemarker.version>
<ecj.version>4.4.2</ecj.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> <gemfire.version>8.0.0</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.12</gradle.version> <gradle.version>1.12</gradle.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment