diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index fb24cb0444..746a38607d 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -27,7 +27,8 @@ public enum ElasticVersion { V7_3("7.3.*"), V7_4("7.4.*"), V7_5("7.5.*"), - V7_6("7.6.*"); + V7_6("7.6.*"), + V7_7("7.7.*"); 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 f8e64f6c9b..214861c69f 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -32,7 +32,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_6); + return getConfig(ElasticVersion.V7_7); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index e0e8bb4303..74f25e42b9 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -31,7 +31,7 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_6); + return getConfig(ElasticVersion.V7_7); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index df3ec5e3bd..15094fdd1e 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -58,6 +58,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.5.2"; case V7_6: return "blacktop/elasticsearch:7.6.2"; + case V7_7: + return "blacktop/elasticsearch:7.7.0"; } 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 4a5345aa29..bbddaa277a 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_6); + container = ElasticContainer.createAndStart(ElasticVersion.V7_7); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 979a7f65dd..e12df9c029 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -42,7 +42,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { public static void startIndexService() { if (container == null) { // Only start Elasticsearch once - container = ElasticContainer.createAndStart(ElasticVersion.V7_6); + container = ElasticContainer.createAndStart(ElasticVersion.V7_7); client = HttpAsyncClients.createDefault(); client.start(); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 6b979b331a..5fec685dff 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_6); + container = ElasticContainer.createAndStart(ElasticVersion.V7_7); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index 4106d8b756..3e8bab4bd3 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_6); + container = ElasticContainer.createAndStart(ElasticVersion.V7_7); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 825d221569..309c63a00e 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -54,6 +54,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.6.0")).isEqualTo(ElasticVersion.V7_6); assertThat(ElasticVersion.forVersion("7.6.1")).isEqualTo(ElasticVersion.V7_6); + + assertThat(ElasticVersion.forVersion("7.7.0")).isEqualTo(ElasticVersion.V7_7); + assertThat(ElasticVersion.forVersion("7.7.1")).isEqualTo(ElasticVersion.V7_7); } @Test @@ -76,6 +79,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -90,6 +94,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_5.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_6.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_7.isV6OrLater()).isTrue(); } @Test @@ -104,5 +109,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_5.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_6.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_7.isV7OrLater()).isTrue(); } } diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 7e542f9f0b..d63ac4c742 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -94,8 +94,8 @@ def declare_nongoogle_deps(): # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.2", - sha1 = "3da6691dcd1864243f11f07d51907320452c6400", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.7.0", + sha1 = "5fc25eec3940bc0e9b0ffddcf50554a609e9db8e", ) maven_jar(