opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.2' into stable-3.3

Browse Source 
* stable-3.2:
  Set version to 3.2.7-SNAPSHOT
  Set version to 3.2.6
  Set version to 3.1.12-SNAPSHOT
  Set version to 3.1.11
  Fix httpcore dependency needed by httpclient
  Revert "Add support for Elasticsearch version 7.9.*"
  Revert "Add support for Elasticsearch version 7.10.*"

Change-Id: I5f4d056da058089cc65a4dab93dc6d1da4aded51
This commit is contained in:
Luca Milanesio
2020-12-23 17:43:01 +00:00
parent d14db1f2cc c02530fa41
commit 3022f423c9
11 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -825,8 +825,8 @@ maven_jar(
maven_jar(
name = "httpcore",
artifact = "org.apache.httpcomponents:httpcore:4.4.12",
sha1 = "21ebaf6d532bc350ba95bd81938fa5f0e511c132",
artifact = "org.apache.httpcomponents:httpcore:4.4.4",
sha1 = "b31526a230871fbe285fbcbe2813f9c0839ae9b0",
)
# Test-only dependencies below.

4
java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -24,9 +24,7 @@ public enum ElasticVersion {
V7_5("7.5.*"),
V7_6("7.6.*"),
V7_7("7.7.*"),
V7_8("7.8.*"),
V7_9("7.9.*"),
V7_10("7.10.*");
V7_8("7.8.*");
private final String version;
private final Pattern pattern;

2
javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
View File

@@ -26,7 +26,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
@ConfigSuite.Default
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_10);
return getConfig(ElasticVersion.V7_8);
}
@Override

2
javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java
View File

@@ -28,7 +28,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
@ConfigSuite.Default
public static Config elasticsearchV7() {
return getConfig(ElasticVersion.V7_10);
return getConfig(ElasticVersion.V7_8);
}
@Override

4
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -53,10 +53,6 @@ public class ElasticContainer extends ElasticsearchContainer {
return "blacktop/elasticsearch:7.7.1";
case V7_8:
return "blacktop/elasticsearch:7.8.1";
case V7_9:
return "blacktop/elasticsearch:7.9.3";
case V7_10:
return "blacktop/elasticsearch:7.10.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
View File

@@ -46,7 +46,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
client = HttpAsyncClients.createDefault();
client.start();
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
View File

@@ -36,7 +36,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
public static void startIndexService() {
if (container == null) {
// Only start Elasticsearch once
container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
}
}

6
javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java
View File

@@ -42,12 +42,6 @@ public class ElasticVersionTest {
assertThat(ElasticVersion.forVersion("7.8.0")).isEqualTo(ElasticVersion.V7_8);
assertThat(ElasticVersion.forVersion("7.8.1")).isEqualTo(ElasticVersion.V7_8);
assertThat(ElasticVersion.forVersion("7.9.0")).isEqualTo(ElasticVersion.V7_9);
assertThat(ElasticVersion.forVersion("7.9.1")).isEqualTo(ElasticVersion.V7_9);
assertThat(ElasticVersion.forVersion("7.10.0")).isEqualTo(ElasticVersion.V7_10);
assertThat(ElasticVersion.forVersion("7.10.1")).isEqualTo(ElasticVersion.V7_10);
}
@Test

4
tools/nongoogle.bzl
View File

@@ -97,8 +97,8 @@ def declare_nongoogle_deps():
# org.apache.httpcomponents dependencies in ../WORKSPACE.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.10.1",
sha1 = "b2e89d266c2c0039a69504f78c9230582ea095ee",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.8.1",
sha1 = "59feefe006a96a39f83b0dfb6780847e06c1d0a8",
)
maven_jar(