From aa4789722e55184b2ea86fb6d2ca3c603a58b235 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 7 Dec 2020 15:57:38 -0500 Subject: Add support for Elasticsearch version 7.10.* Upgrade elasticsearch-rest-client to 7.10.1. Add V7_10 to the version manager and use it for all the V7 tests. Change-Id: Ifb941eea63b90e107ae37c6a08ab1815d6c0f22b --- java/com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- javatests/com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 2 +- javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java | 3 +++ tools/nongoogle.bzl | 4 ++-- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index ba5f1fed63..c9323b2ec5 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -25,7 +25,8 @@ public enum ElasticVersion { V7_6("7.6.*"), V7_7("7.7.*"), V7_8("7.8.*"), - V7_9("7.9.*"); + V7_9("7.9.*"), + V7_10("7.10.*"); 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..27b4527424 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_10); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 313160df18..36e564cb67 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_10); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index b0da80d388..96e728a409 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -55,6 +55,8 @@ 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 89391c5582..ca614460e3 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_10); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 01bc902a0c..c0f40a9362 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_10); 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..46fb6f0862 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_10); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index d2149e979e..ef2b644821 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_10); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 0ca57a5961..85e8e9eb1c 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -45,6 +45,9 @@ 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 6c1a853510..410f479d72 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.10.1", + sha1 = "b2e89d266c2c0039a69504f78c9230582ea095ee", ) maven_jar( -- cgit v1.2.3