summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Miller <marco.miller@ericsson.com>2021-05-25 15:14:57 -0400
committerMarco Miller <marco.miller@ericsson.com>2021-05-25 15:14:57 -0400
commit93628061d137720470e1df8cf768d5ac3bfcaef6 (patch)
treea2129614325b89313504de2b4dabe97438478e10
parent8977bc660abccb055ee75145a618507dba1b2cdf (diff)
Elasticsearch: Discontinue EOL version 7.4 support
Remove support for elasticsearch V7_4, as it became EOL since April [1]. [1] https://www.elastic.co/support/eol Change-Id: I9a0d1e7ff6f49aa89479538817dc5836f06066a4
-rw-r--r--java/com/google/gerrit/elasticsearch/ElasticVersion.java1
-rw-r--r--javatests/com/google/gerrit/elasticsearch/ElasticContainer.java2
-rw-r--r--javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java3
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 5e7278074d..6ca51fa1c5 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_4("7.4.*"),
V7_5("7.5.*"),
V7_6("7.6.*"),
V7_7("7.7.*"),
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 8cd09e66a7..4d7468f7c8 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_4:
- return "blacktop/elasticsearch:7.4.2";
case V7_5:
return "blacktop/elasticsearch:7.5.2";
case V7_6:
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
index 508dc84470..75e963641d 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.4.0")).isEqualTo(ElasticVersion.V7_4);
- assertThat(ElasticVersion.forVersion("7.4.1")).isEqualTo(ElasticVersion.V7_4);
-
assertThat(ElasticVersion.forVersion("7.5.0")).isEqualTo(ElasticVersion.V7_5);
assertThat(ElasticVersion.forVersion("7.5.1")).isEqualTo(ElasticVersion.V7_5);