root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to Elasticsearch 1.5.2 

Closes gh-3194
This commit is contained in:
Andy Wilkinson 2015-06-10 13:29:34 +01:00
parent ae64d84b15
commit f73d86e700
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
View File

@ -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;
}

2
spring-boot-dependencies/pom.xml
View File

@ -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>