From 5630d16a25033b48f0a5aa27640645e4a77ad08d Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@graylog.com>
Date: Fri, 5 May 2017 13:20:37 +0200
Subject: [PATCH 1/3] Use Oracle JDK 8 instead of OpenJDK 8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9dc39874f..2796408b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 dist: trusty
 jdk:
-  - openjdk8
+  - oraclejdk8
 sudo: false
 env:
   global:

From 9a89925f6dac64296a2105acbb64e2927bacb938 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@graylog.com>
Date: Mon, 8 May 2017 11:56:40 +0200
Subject: [PATCH 2/3] Don't reuse JVM forks in tests

---
 pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68f707e77..9962762a7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -514,12 +514,14 @@
                                     <excludes>
                                         <exclude>none</exclude>
                                     </excludes>
-                                    <argLine>-XX:+PrintGCDetails -Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Djava.net.preferIPv4Stack=true -Dtests.security.manager=false</argLine>
+                                    <argLine>-Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Djava.net.preferIPv4Stack=true -Dtests.security.manager=false</argLine>
+                                    <reuseForks>false</reuseForks>
                                 </configuration>
                             </execution>
                         </executions>
                         <configuration>
-                            <argLine>-XX:+PrintGCDetails -Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Dtests.security.manager=false</argLine>
+                            <argLine>-Xmx${tests.heap.size} -Xms${tests.heap.size} -Dtests.heap.size=${tests.heap.size} -Dtests.security.manager=false</argLine>
+                            <reuseForks>false</reuseForks>
                         </configuration>
                     </plugin>
                 </plugins>

From 2c279e38c0d4aedc84b579b5a51d255d26562690 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@graylog.com>
Date: Mon, 8 May 2017 12:26:25 +0200
Subject: [PATCH 3/3] Ensure fully connected cluster in
 NodesStatsIntegrationTest

---
 .../java/io/searchbox/cluster/NodesStatsIntegrationTest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java
index cc0896a4e..2c83c9766 100644
--- a/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java
+++ b/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java
@@ -23,8 +23,7 @@ public class NodesStatsIntegrationTest extends AbstractIntegrationTest {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        ensureClusterSizeConsistency();
-        ensureClusterStateConsistency();
+        ensureFullyConnectedCluster();
     }
 
     @Test