diff options
author | Marco Miller <marco.miller@ericsson.com> | 2021-06-22 14:38:15 -0400 |
---|---|---|
committer | Marco Miller <marco.miller@ericsson.com> | 2021-06-22 14:38:15 -0400 |
commit | 3c3b8e2b0622078a1c9e6d05a597b65ec39d8c23 (patch) | |
tree | a716c5b10c2e440f6344a19b3f86a26225e30584 | |
parent | 2794dd53c0346bf102b5146c5446e8201e5879a5 (diff) |
Elasticsearch: Discontinue EOL version 7.5 support
Remove support for elasticsearch V7_5, as it became EOL since June [1].
[1] https://www.elastic.co/support/eol
Change-Id: I46cc3849a5cf1fad30b007fe09f8d1cdbe4d588b
3 files changed, 0 insertions, 6 deletions
diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index 6ca51fa1c5..c6400dfd55 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -18,7 +18,6 @@ import com.google.common.base.Joiner; import java.util.regex.Pattern; public enum ElasticVersion { - V7_5("7.5.*"), V7_6("7.6.*"), V7_7("7.7.*"), V7_8("7.8.*"); diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 4d7468f7c8..c3309610e5 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -39,8 +39,6 @@ public class ElasticContainer extends ElasticsearchContainer { private static String getImageName(ElasticVersion version) { switch (version) { - case V7_5: - return "blacktop/elasticsearch:7.5.2"; case V7_6: return "blacktop/elasticsearch:7.6.2"; case V7_7: diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 75e963641d..2ce3a2c118 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -22,9 +22,6 @@ import org.junit.Test; public class ElasticVersionTest { @Test public void supportedVersion() throws Exception { - assertThat(ElasticVersion.forVersion("7.5.0")).isEqualTo(ElasticVersion.V7_5); - assertThat(ElasticVersion.forVersion("7.5.1")).isEqualTo(ElasticVersion.V7_5); - assertThat(ElasticVersion.forVersion("7.6.0")).isEqualTo(ElasticVersion.V7_6); assertThat(ElasticVersion.forVersion("7.6.1")).isEqualTo(ElasticVersion.V7_6); |