Merge changes Ie932c13c,I6bc8c176 into stable-2.16

* changes:
  ElasticV7QueryProjectsTest: Also use Elasticsearch 7.1
  Merge branch 'stable-2.15' into stable-2.16

WORKSPACE

@@ -1122,8 +1122,8 @@ maven_jar(
 # and httpasyncclient as necessary.
 maven_jar(
     name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.0.1",
-    sha1 = "bc8c679f6e53a51a99190a7a3108ab760b24bbf5",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.0",
+    sha1 = "93e8e8b96121069d1d6a6f94d29e7aebd3327301",
 )
 
 maven_jar(

java/com/google/gerrit/elasticsearch/ElasticVersion.java

@@ -25,7 +25,8 @@ public enum ElasticVersion {
   V6_5("6.5.*"),
   V6_6("6.6.*"),
   V6_7("6.7.*"),
-  V7_0("7.0.*");
+  V7_0("7.0.*"),
+  V7_1("7.1.*");
 
   private final String version;
   private final Pattern pattern;

javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java

@@ -37,7 +37,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
 
   @ConfigSuite.Config
   public static Config elasticsearchV7() {
-    return getConfig(ElasticVersion.V7_0);
+    return getConfig(ElasticVersion.V7_1);
   }
 
   @Override

javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java

@@ -36,7 +36,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
 
   @ConfigSuite.Config
   public static Config elasticsearchV7() {
-    return getConfig(ElasticVersion.V7_0);
+    return getConfig(ElasticVersion.V7_1);
   }
 
   @Override

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

@@ -52,6 +52,8 @@ public class ElasticContainer extends ElasticsearchContainer {
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.2";
       case V7_0:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.1";
+      case V7_1:
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }

javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java

@@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
       return;
     }
 
-    container = ElasticContainer.createAndStart(ElasticVersion.V7_0);
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
   }
 

javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java

@@ -47,7 +47,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
       return;
     }
 
-    container = ElasticContainer.createAndStart(ElasticVersion.V7_0);
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
     client = HttpAsyncClients.createDefault();
     client.start();

javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java

@@ -41,7 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
       return;
     }
 
-    container = ElasticContainer.createAndStart(ElasticVersion.V7_0);
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
   }
 

javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java

@@ -41,7 +41,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
       return;
     }
 
-    container = ElasticContainer.createAndStart(ElasticVersion.V7_0);
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
   }