Merge branch 'stable-2.16' into stable-3.0
Change-Id: I12352f08704fdd88c8f28d44bf08df0660a26c04
* stable-2.16:
Make the build pipeline fail if cannot post Checks feedback
Switch to using no-AOP guice distribution
Bazel: Use canonical_id for artifacts cached by http_file
Fix for Memory leak in gr-plugin-endpoints
Documentation: Clarify how to log e2e http details
Make legacy version of the commit-msg hook available
commit-msg: Remove obsolete comments
Upgrade testcontainers to 1.14.0
Bump asm to version 7.2
Upgrade guice to 4.2.3
PostReview: Avoid multiple notifications for existing reviewers
ChangeApi: Remove deprecated getEdit method
ChangeApi: Remove useless @Deprecated annotation in NotImplemented
Plugin API: Remove deprecated draft workflow methods
ErrorProne: Enable ObjectToString check at ERROR severity
Project: Add implementation of toString
Account: Add implementation of toString
LegacyChangeNoteWrite: Remove unused newIdent method
PolyGerrit: Document commit-container extension endpoint
e2e-tests: Make all current scenario names unique
e2e-tests: Make http request name unique
e2e-tests: Fix CloneUsingBothProtocols wait times
e2e-tests: Create/delete ReplayRecordsFromFeeder project
e2e-tests: Unhardcode ReplayRecordsFromFeeder data
e2e-tests: Stabilize the ReplayRecordsFromFeeder scenario
Remove obsolete FindBugs configuration
Elasticsearch: Remove support for EOL 6.x versions
REST: Allow to create annotated tag with only CREATE_TAG
Upgrade recommended version of buildifier to 2.2.1
Bump Bazel version to 3.0.0
CreateRefControl: Pass CurrentUser to Reachable
diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
index 2d023cf..82816fb 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java
@@ -18,9 +18,6 @@
import java.util.regex.Pattern;
public enum ElasticVersion {
- V6_2("6.2.*"),
- V6_3("6.3.*"),
- V6_4("6.4.*"),
V6_5("6.5.*"),
V6_6("6.6.*"),
V6_7("6.7.*"),
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 879c7c5..e4b45ed 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -38,12 +38,6 @@
private static String getImageName(ElasticVersion version) {
switch (version) {
- case V6_2:
- return "blacktop/elasticsearch:6.2.4";
- case V6_3:
- return "blacktop/elasticsearch:6.3.2";
- case V6_4:
- return "blacktop/elasticsearch:6.4.3";
case V6_5:
return "blacktop/elasticsearch:6.5.4";
case V6_6:
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
index 83f1e1b..6b0c2b1 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
@@ -22,15 +22,6 @@
public class ElasticVersionTest extends GerritBaseTests {
@Test
public void supportedVersion() throws Exception {
- assertThat(ElasticVersion.forVersion("6.2.0")).isEqualTo(ElasticVersion.V6_2);
- assertThat(ElasticVersion.forVersion("6.2.4")).isEqualTo(ElasticVersion.V6_2);
-
- assertThat(ElasticVersion.forVersion("6.3.0")).isEqualTo(ElasticVersion.V6_3);
- assertThat(ElasticVersion.forVersion("6.3.2")).isEqualTo(ElasticVersion.V6_3);
-
- assertThat(ElasticVersion.forVersion("6.4.0")).isEqualTo(ElasticVersion.V6_4);
- assertThat(ElasticVersion.forVersion("6.4.1")).isEqualTo(ElasticVersion.V6_4);
-
assertThat(ElasticVersion.forVersion("6.5.0")).isEqualTo(ElasticVersion.V6_5);
assertThat(ElasticVersion.forVersion("6.5.1")).isEqualTo(ElasticVersion.V6_5);
@@ -75,9 +66,6 @@
@Test
public void atLeastMinorVersion() throws Exception {
- assertThat(ElasticVersion.V6_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
- assertThat(ElasticVersion.V6_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
- assertThat(ElasticVersion.V6_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
assertThat(ElasticVersion.V6_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isTrue();
@@ -93,9 +81,6 @@
@Test
public void version6OrLater() throws Exception {
- assertThat(ElasticVersion.V6_2.isV6OrLater()).isTrue();
- assertThat(ElasticVersion.V6_3.isV6OrLater()).isTrue();
- assertThat(ElasticVersion.V6_4.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_5.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_6.isV6OrLater()).isTrue();
assertThat(ElasticVersion.V6_7.isV6OrLater()).isTrue();
@@ -111,9 +96,6 @@
@Test
public void version7OrLater() throws Exception {
- assertThat(ElasticVersion.V6_2.isV7OrLater()).isFalse();
- assertThat(ElasticVersion.V6_3.isV7OrLater()).isFalse();
- assertThat(ElasticVersion.V6_4.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_5.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_6.isV7OrLater()).isFalse();
assertThat(ElasticVersion.V6_7.isV7OrLater()).isFalse();
