diff --git a/WORKSPACE b/WORKSPACE index b66ed03d5e..374c813b1e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1045,8 +1045,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.2", - sha1 = "38721e908cad8a30fa3f8e659c0571150a60cab3", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.0", + sha1 = "481fedd31088ec6ba79a2aeffec3eccae4c0772b", ) maven_jar( diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index baf3e38cfa..309ee3e5b9 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -29,7 +29,8 @@ public enum ElasticVersion { V7_0("7.0.*"), V7_1("7.1.*"), V7_2("7.2.*"), - V7_3("7.3.*"); + V7_3("7.3.*"), + V7_4("7.4.*"); 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 c18c0927f9..c0f27bd208 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/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_3); + return getConfig(ElasticVersion.V7_4); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 6ccd9e0d6f..61a490bbca 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/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_3); + return getConfig(ElasticVersion.V7_4); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 27ac8390e0..6e3d6668bd 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -60,6 +60,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.2.1"; case V7_3: return "blacktop/elasticsearch:7.3.2"; + case V7_4: + return "blacktop/elasticsearch:7.4.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 4010fba814..241a42e2ae 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 010411f45b..d8ae836717 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -47,7 +47,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); client = HttpAsyncClients.createDefault(); client.start(); diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 0a0502aaad..4bc506defe 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index d902b10c0a..a970ff7283 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_3); + container = ElasticContainer.createAndStart(ElasticVersion.V7_4); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index bdc0973d42..689265dde7 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -57,6 +57,9 @@ public class ElasticVersionTest extends GerritBaseTests { assertThat(ElasticVersion.forVersion("7.3.0")).isEqualTo(ElasticVersion.V7_3); assertThat(ElasticVersion.forVersion("7.3.1")).isEqualTo(ElasticVersion.V7_3); + + assertThat(ElasticVersion.forVersion("7.4.0")).isEqualTo(ElasticVersion.V7_4); + assertThat(ElasticVersion.forVersion("7.4.1")).isEqualTo(ElasticVersion.V7_4); } @Test @@ -81,6 +84,7 @@ public class ElasticVersionTest extends GerritBaseTests { assertThat(ElasticVersion.V7_1.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -97,6 +101,7 @@ public class ElasticVersionTest extends GerritBaseTests { assertThat(ElasticVersion.V7_1.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue(); } @Test @@ -113,5 +118,6 @@ public class ElasticVersionTest extends GerritBaseTests { assertThat(ElasticVersion.V7_1.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue(); } }