diff options
author | Luca Milanesio <luca.milanesio@gmail.com> | 2020-12-23 08:04:10 +0000 |
---|---|---|
committer | Luca Milanesio <luca.milanesio@gmail.com> | 2020-12-23 08:06:29 +0000 |
commit | d9f54f792c440ba50d8b9bf5c1e8b32620d5095f (patch) | |
tree | 40b947fbfaf95da1359e88b69272ac78a98ff2e8 | |
parent | e80a7fde7b15646adb658000ed3d2dddeef45586 (diff) |
Revert "Add support for Elasticsearch version 7.9.*"
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: Ib95a8c053fa7f046596458e7eb719a409847cb82
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 ba5f1fed63..bba1577147 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -24,8 +24,7 @@ public enum ElasticVersion { V7_5("7.5.*"), V7_6("7.6.*"), V7_7("7.7.*"), - V7_8("7.8.*"), - V7_9("7.9.*"); + V7_8("7.8.*"); 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 98f4f859da..f23cc10cb8 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_9); + return getConfig(ElasticVersion.V7_8); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 313160df18..f35bcb79eb 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_9); + return getConfig(ElasticVersion.V7_8); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index b0da80d388..e8cf3e90ea 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -53,8 +53,6 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.7.1"; case V7_8: return "blacktop/elasticsearch:7.8.1"; - case V7_9: - return "blacktop/elasticsearch:7.9.3"; } 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 89391c5582..48264906d4 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_9); + container = ElasticContainer.createAndStart(ElasticVersion.V7_8); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 01bc902a0c..d9a4d2ebc2 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_9); + container = ElasticContainer.createAndStart(ElasticVersion.V7_8); client = HttpAsyncClients.createDefault(); client.start(); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 472ac89da6..0fc96f8388 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_9); + container = ElasticContainer.createAndStart(ElasticVersion.V7_8); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index d2149e979e..1e56af9556 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_9); + container = ElasticContainer.createAndStart(ElasticVersion.V7_8); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 0ca57a5961..1ec8a5dadd 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -42,9 +42,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.8.0")).isEqualTo(ElasticVersion.V7_8); assertThat(ElasticVersion.forVersion("7.8.1")).isEqualTo(ElasticVersion.V7_8); - - assertThat(ElasticVersion.forVersion("7.9.0")).isEqualTo(ElasticVersion.V7_9); - assertThat(ElasticVersion.forVersion("7.9.1")).isEqualTo(ElasticVersion.V7_9); } @Test diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 6c1a853510..5165e09483 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.9.3", - sha1 = "0b621621ecc6a8d9b536334d5f3301940302efd2", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.8.1", + sha1 = "59feefe006a96a39f83b0dfb6780847e06c1d0a8", ) maven_jar( |