diff --git a/WORKSPACE b/WORKSPACE index 304faf58a4..2703222f02 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -925,8 +925,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.1", - sha1 = "ca04d8012f92cac561be343b931ec73302b2ff3e", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.2.0", + sha1 = "39cf34068b0af284eaa9b8bd86a131cb24b322d5", ) maven_jar( diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index fc8ef6e0b8..a887ef8391 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/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_1); + return getConfig(ElasticVersion.V7_2); } @Override diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 4b899c924f..1af3065d4b 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/gerrit-acceptance-tests/src/test/java/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_1); + return getConfig(ElasticVersion.V7_2); } @Override diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java index 6be41c8109..e608e935f5 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -26,7 +26,8 @@ public enum ElasticVersion { V6_6("6.6.*"), V6_7("6.7.*"), V7_0("7.0.*"), - V7_1("7.1.*"); + V7_1("7.1.*"), + V7_2("7.2.*"); private final String version; private final Pattern pattern; diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index dcdaed02e1..faff920a23 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -54,6 +54,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.0.1"; case V7_1: return "blacktop/elasticsearch:7.1.1"; + case V7_2: + return "blacktop/elasticsearch:7.2.0"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 582a0e7c59..f08b8373f4 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -34,7 +34,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_1); + container = ElasticContainer.createAndStart(ElasticVersion.V7_2); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 01f49e0aba..a29f7ec21d 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_1); + container = ElasticContainer.createAndStart(ElasticVersion.V7_2); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); client = HttpAsyncClients.createDefault(); client.start(); diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 8c367b6d67..6689a093ac 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -34,7 +34,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_1); + container = ElasticContainer.createAndStart(ElasticVersion.V7_2); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java index c79210977c..6ddd7a97d4 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -51,6 +51,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.1.0")).isEqualTo(ElasticVersion.V7_1); assertThat(ElasticVersion.forVersion("7.1.1")).isEqualTo(ElasticVersion.V7_1); + + assertThat(ElasticVersion.forVersion("7.2.0")).isEqualTo(ElasticVersion.V7_2); + assertThat(ElasticVersion.forVersion("7.2.1")).isEqualTo(ElasticVersion.V7_2); } @Test @@ -72,6 +75,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V6_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isTrue(); assertThat(ElasticVersion.V7_0.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_1.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -85,6 +89,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V6_7.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_0.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_1.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue(); } @Test @@ -98,5 +103,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V6_7.isV7OrLater()).isFalse(); assertThat(ElasticVersion.V7_0.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_1.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue(); } }