commit 314c0b0ff1cd2a423314ee7b114ecfdec59b02e0
author Marco Miller <marco.miller@ericsson.com> Wed May 26 11:07:37 2021 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed May 26 11:07:37 2021 -0400
tree b1396d2e6803c71ca5839fe2863bee931df36030
parent 105ae053928aa2388ea3ff0139ce2ef441d3513e
parent 7bdf44e9d311dbeb85cea0a873fef21f8abcbb69

Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Elasticsearch: Discontinue EOL version 7.4 support

Change-Id: I5d5669898d56e977ec6a00b2766b66ecfa773bb5

java/com/google/gerrit/elasticsearch/ElasticVersion.java

diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
index 5e72780..6ca51fa 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
@@ -18,7 +18,6 @@
 import java.util.regex.Pattern;
 
 public enum ElasticVersion {
-  V7_4("7.4.*"),
   V7_5("7.5.*"),
   V7_6("7.6.*"),
   V7_7("7.7.*"),

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 8cd09e6..4d7468f 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -39,8 +39,6 @@
 
   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:

javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
index 508dc84..75e9636 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
@@ -22,9 +22,6 @@
 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);