Revert "Add support for Elasticsearch version 7.10.*"

Revert submission 291062

Reason for revert: requires an httpclient that Google cannot support
Reverted Changes:
I1fc91bce9:Align http dependencies with elasticsearch-rest-cl...
Ifb941eea6:Add support for Elasticsearch version 7.10.*
I7d76ece60:Add support for Elasticsearch version 7.9.*

Change-Id: I740e06058469a0ab12b14c7c616940bf429d0de7

10 files changed, 9 insertions, 15 deletions

diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
index c9323b2ec5..ba5f1fed63 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
@@ -25,8 +25,7 @@ public enum ElasticVersion {
   V7_6("7.6.*"),
   V7_7("7.7.*"),
   V7_8("7.8.*"),
-  V7_9("7.9.*"),
-  V7_10("7.10.*");
+  V7_9("7.9.*");
 
   private final String version;
   private final Pattern pattern;
diff --git a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
index 27b4527424..98f4f859da 100644
--- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
+++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
@@ -26,7 +26,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
 
   @ConfigSuite.Default
   public static Config elasticsearchV7() {
-    return getConfig(ElasticVersion.V7_10);
+    return getConfig(ElasticVersion.V7_9);
   }
 
   @Override
diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
index 36e564cb67..313160df18 100644
--- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
@@ -28,7 +28,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
 
   @ConfigSuite.Default
   public static Config elasticsearchV7() {
-    return getConfig(ElasticVersion.V7_10);
+    return getConfig(ElasticVersion.V7_9);
   }
 
   @Override
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 96e728a409..b0da80d388 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -55,8 +55,6 @@ public class ElasticContainer extends ElasticsearchContainer {
         return "blacktop/elasticsearch:7.8.1";
       case V7_9:
         return "blacktop/elasticsearch:7.9.3";
-      case V7_10:
-        return "blacktop/elasticsearch:7.10.1";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
index ca614460e3..89391c5582 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
@@ -36,7 +36,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
     }
   }
 
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index c0f40a9362..01bc902a0c 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -46,7 +46,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
       client = HttpAsyncClients.createDefault();
       client.start();
     }
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
index 46fb6f0862..472ac89da6 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
@@ -36,7 +36,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
     }
   }
 
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
index ef2b644821..d2149e979e 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
@@ -36,7 +36,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_9);
     }
   }
 
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
index 85e8e9eb1c..0ca57a5961 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
@@ -45,9 +45,6 @@ public class ElasticVersionTest {
 
     assertThat(ElasticVersion.forVersion("7.9.0")).isEqualTo(ElasticVersion.V7_9);
     assertThat(ElasticVersion.forVersion("7.9.1")).isEqualTo(ElasticVersion.V7_9);
-
-    assertThat(ElasticVersion.forVersion("7.10.0")).isEqualTo(ElasticVersion.V7_10);
-    assertThat(ElasticVersion.forVersion("7.10.1")).isEqualTo(ElasticVersion.V7_10);
   }
 
   @Test
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 410f479d72..6c1a853510 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -103,8 +103,8 @@ def declare_nongoogle_deps():
     # org.apache.httpcomponents dependencies in ../WORKSPACE.
     maven_jar(
         name = "elasticsearch-rest-client",
-        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.10.1",
-        sha1 = "b2e89d266c2c0039a69504f78c9230582ea095ee",
+        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.9.3",
+        sha1 = "0b621621ecc6a8d9b536334d5f3301940302efd2",
     )
 
     maven_jar(