From e4448e1c49e9c9cf06b977afcd3763de575ad561 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 8 Nov 2018 15:21:02 +0900 Subject: [PATCH 1/8] Set version to 2.14.17 Change-Id: I6e8d9b78215d6fe3ce199b53fe850685d110b6e3 --- gerrit-acceptance-framework/pom.xml | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 95915f0008..3730735573 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.14.17-SNAPSHOT + 2.14.17 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 2b4e9969fd..c627796ece 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.14.17-SNAPSHOT + 2.14.17 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 06bd0c287e..55f46932e7 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.14.17-SNAPSHOT + 2.14.17 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index a61255911d..81c4e922e8 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.14.17-SNAPSHOT + 2.14.17 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 939833dfe4..0aac5f7417 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.14.17-SNAPSHOT + 2.14.17 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 244486cac9..92eca8499b 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "2.14.17-SNAPSHOT" +GERRIT_VERSION = "2.14.17" From d4d41ee60c70def4c1a555c79dfdcc8157d18158 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Wed, 14 Nov 2018 20:55:40 +0000 Subject: [PATCH 2/8] Set version to 2.16 Change-Id: Iab03437a56ffea76e15fecd07d906074ff05fe11 --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-plugin-gwtui_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index e66a9386f3..b20dfc5743 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.16-rc3 + 2.16 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index 623964c349..c449151d21 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.16-rc3 + 2.16 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 212e7398bb..463bd93301 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.16-rc3 + 2.16 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml index 1fe482c750..70f7caaa5f 100644 --- a/tools/maven/gerrit-plugin-gwtui_pom.xml +++ b/tools/maven/gerrit-plugin-gwtui_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.16-rc3 + 2.16 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 4a84174d66..89ae87bd95 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.16-rc3 + 2.16 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 04b03a742a..0b158b7c3a 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "2.16-rc3" +GERRIT_VERSION = "2.16" From f0a3fba49a06127b509314c62b88ee059edc4aa9 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 14 Nov 2018 17:46:38 -0800 Subject: [PATCH 3/8] Fix: Invalid operation for forward only resultset : first Use ResultSet#next() insteadof using ResultSet#first(). As mentioned in Javadoc for ResultSet#first(): This method is called on a closed result set or the result set type is TYPE_FORWARD_ONLY exception SQLFeatureNotSupportedException if the JDBC driver does not support this method. Bug: Issue 10018 Change-Id: Ica6c72f2d489520ae367b608867f5b8c6a5ef276 --- java/com/google/gerrit/server/schema/Schema_151.java | 2 +- java/com/google/gerrit/server/schema/Schema_87.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/schema/Schema_151.java b/java/com/google/gerrit/server/schema/Schema_151.java index 7d12e5801f..41d8a32cea 100644 --- a/java/com/google/gerrit/server/schema/Schema_151.java +++ b/java/com/google/gerrit/server/schema/Schema_151.java @@ -60,7 +60,7 @@ public class Schema_151 extends SchemaVersion { PreparedStatement addedOnRetrieval, AccountGroup.Id groupId) throws SQLException { addedOnRetrieval.setInt(1, groupId.get()); try (ResultSet resultSet = addedOnRetrieval.executeQuery()) { - if (resultSet.first()) { + if (resultSet.next()) { return Optional.of(resultSet.getTimestamp(1)); } } diff --git a/java/com/google/gerrit/server/schema/Schema_87.java b/java/com/google/gerrit/server/schema/Schema_87.java index 8a3ea0860e..5865af0d4b 100644 --- a/java/com/google/gerrit/server/schema/Schema_87.java +++ b/java/com/google/gerrit/server/schema/Schema_87.java @@ -59,7 +59,7 @@ public class Schema_87 extends SchemaVersion { PreparedStatement uuidRetrieval, AccountGroup.Id id) throws SQLException { uuidRetrieval.setInt(1, id.get()); try (ResultSet uuidResults = uuidRetrieval.executeQuery()) { - if (uuidResults.first()) { + if (uuidResults.next()) { Optional.of(new AccountGroup.UUID(uuidResults.getString(1))); } } From 0f13adc0bb04cea1578c5d86db5328324f2db05a Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 14 Nov 2018 19:05:43 -0800 Subject: [PATCH 4/8] Add Marco Miller as a developer in pom.xml files Change-Id: Ia199c7e3d8d716052e37fbf600f9f59ea4e7471a --- gerrit-acceptance-framework/pom.xml | 3 +++ gerrit-extension-api/pom.xml | 3 +++ gerrit-plugin-api/pom.xml | 3 +++ gerrit-plugin-gwtui/pom.xml | 3 +++ gerrit-war/pom.xml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 3730735573..4c49558283 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index c627796ece..478911d1c1 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 55f46932e7..09182fe5b2 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 81c4e922e8..fbf5b5eb04 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 0aac5f7417..b1f16b60a6 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick From 1e7fb56afc110bfa9f049cd4e4b028a5fd59429e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 14 Nov 2018 21:28:35 -0800 Subject: [PATCH 5/8] Add support for Elasticsearch 6.5.0 Feature: Issue 10038 Change-Id: Iea007c8188053dc5cf93e46f0638faca1960b09c --- WORKSPACE | 4 ++-- .../com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- .../java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticQueryAdapter.java | 1 + .../java/com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../gerrit/elasticsearch/ElasticV6QueryAccountsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV6QueryChangesTest.java | 2 +- .../google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b27efa560e..6a1228c95f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -896,8 +896,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.3", - sha1 = "5c24325430971ba2fa4769eb446f026b7680d5e7", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.0", + sha1 = "241436d27cf65b84d17126dc7b6b947e8e2c173c", ) JACKSON_VERSION = "2.9.7" diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index 9579e1991b..61bddc4976 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -48,7 +48,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Config public static Config elasticsearchV6() { - return getConfig(ElasticVersion.V6_4); + return getConfig(ElasticVersion.V6_5); } @Override diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 602c50e266..cf8c24a0bd 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -47,7 +47,7 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Config public static Config elasticsearchV6() { - return getConfig(ElasticVersion.V6_4); + return getConfig(ElasticVersion.V6_5); } @Override diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java index b52499be57..fcc0455f18 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -39,6 +39,7 @@ public class ElasticQueryAdapter { case V6_2: case V6_3: case V6_4: + case V6_5: this.searchFilteringName = "_source"; this.indicesExistParam = "?allow_no_indices=false"; this.exactFieldType = "keyword"; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java index dfa5d21038..4c98df1d08 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -22,7 +22,8 @@ public enum ElasticVersion { V5_6("5.6.*"), V6_2("6.2.*"), V6_3("6.3.*"), - V6_4("6.4.*"); + V6_4("6.4.*"), + V6_5("6.5.*"); private final String version; private final Pattern pattern; diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index ebb728fe44..55ebd5dcc6 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -52,6 +52,8 @@ public class ElasticContainer> extends Gener return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2"; case V6_4: return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3"; + case V6_5: + return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.0"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java index 059585d00d..5c072760c8 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java @@ -34,7 +34,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java index fa3b6c43f8..7ced86983e 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java @@ -35,7 +35,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java index ee88ee4605..3fe6bfb662 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java @@ -34,7 +34,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } From 5b9fc8c3be2e0b491e20ef27dd2b663829654f4e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 14 Nov 2018 21:33:39 -0800 Subject: [PATCH 6/8] ElasticTestUtils: Factor common code out of ElasticReindexIT/ElasticIndexIT Change-Id: I83b5535f23f3fcf4e07302fb3e28f856537f2743 --- .../acceptance/pgm/ElasticReindexIT.java | 19 ++++--------------- .../gerrit/acceptance/ssh/ElasticIndexIT.java | 19 ++++--------------- .../elasticsearch/ElasticTestUtils.java | 11 +++++++++++ 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index 61bddc4976..dfdf739529 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -14,28 +14,17 @@ package com.google.gerrit.acceptance.pgm; -import com.google.gerrit.elasticsearch.ElasticContainer; -import com.google.gerrit.elasticsearch.ElasticTestUtils; -import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.createAllIndexes; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.getConfig; + import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.testutil.ConfigSuite; import com.google.inject.Injector; -import java.util.UUID; import org.eclipse.jgit.lib.Config; import org.junit.Before; public class ElasticReindexIT extends AbstractReindexTests { - private static Config getConfig(ElasticVersion version) { - ElasticNodeInfo elasticNodeInfo; - ElasticContainer container = ElasticContainer.createAndStart(version); - elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); - String indicesPrefix = UUID.randomUUID().toString(); - Config cfg = new Config(); - ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version); - return cfg; - } - @ConfigSuite.Default public static Config elasticsearchV2() { return getConfig(ElasticVersion.V2_4); @@ -53,7 +42,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @Override public void configureIndex(Injector injector) throws Exception { - ElasticTestUtils.createAllIndexes(injector); + createAllIndexes(injector); } @Before diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index cf8c24a0bd..d32c041b96 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -14,27 +14,16 @@ package com.google.gerrit.acceptance.ssh; -import com.google.gerrit.elasticsearch.ElasticContainer; -import com.google.gerrit.elasticsearch.ElasticTestUtils; -import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.createAllIndexes; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.getConfig; + import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.testutil.ConfigSuite; import com.google.inject.Injector; -import java.util.UUID; import org.eclipse.jgit.lib.Config; public class ElasticIndexIT extends AbstractIndexTests { - private static Config getConfig(ElasticVersion version) { - ElasticNodeInfo elasticNodeInfo; - ElasticContainer container = ElasticContainer.createAndStart(version); - elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); - String indicesPrefix = UUID.randomUUID().toString(); - Config cfg = new Config(); - ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version); - return cfg; - } - @ConfigSuite.Default public static Config elasticsearchV2() { return getConfig(ElasticVersion.V2_4); @@ -52,6 +41,6 @@ public class ElasticIndexIT extends AbstractIndexTests { @Override public void configureIndex(Injector injector) throws Exception { - ElasticTestUtils.createAllIndexes(injector); + createAllIndexes(injector); } } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java index b46e0402b3..9f7b60c760 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java @@ -21,6 +21,7 @@ import com.google.inject.Key; import com.google.inject.TypeLiteral; import java.io.IOException; import java.util.Collection; +import java.util.UUID; import org.eclipse.jgit.lib.Config; public final class ElasticTestUtils { @@ -55,6 +56,16 @@ public final class ElasticTestUtils { } } + public static Config getConfig(ElasticVersion version) { + ElasticNodeInfo elasticNodeInfo; + ElasticContainer container = ElasticContainer.createAndStart(version); + elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + String indicesPrefix = UUID.randomUUID().toString(); + Config cfg = new Config(); + configure(cfg, elasticNodeInfo.port, indicesPrefix, version); + return cfg; + } + private ElasticTestUtils() { // hide default constructor } From f1cded2b60952e1ab77ada420401229d5e521ecf Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 15 Nov 2018 10:48:14 -0800 Subject: [PATCH 7/8] Set version to 2.15.8-SNAPSHOT Change-Id: I841803402800540cbbfe96b66b6443f2e3f21139 --- gerrit-acceptance-framework/pom.xml | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index a3901b62a7..e600a5ade9 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.15.7 + 2.15.8-SNAPSHOT jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index c25aaeb632..1f1304b9da 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.15.7 + 2.15.8-SNAPSHOT jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 47a89e956f..956a1f5d3a 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.15.7 + 2.15.8-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 8dfb964fdc..cc91c7f18e 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.15.7 + 2.15.8-SNAPSHOT jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index f958ece2a8..e5f6d0585c 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.15.7 + 2.15.8-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 154fa4ab37..5062e3091d 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "2.15.7" +GERRIT_VERSION = "2.15.8-SNAPSHOT" From 4fbbdceae8cf0d42365a8c05398cdecb06df5230 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 15 Nov 2018 10:56:02 -0800 Subject: [PATCH 8/8] Set version to 2.16.1-SNAPSHOT Change-Id: I0b8b5e8b3eeb26032751e05543fe2a0e5477a280 --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-plugin-gwtui_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index b20dfc5743..ac43dc9222 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.16 + 2.16.1-SNAPSHOT jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index c449151d21..50072a5387 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.16 + 2.16.1-SNAPSHOT jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 463bd93301..48ae315fb1 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.16 + 2.16.1-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml index 70f7caaa5f..54236d439e 100644 --- a/tools/maven/gerrit-plugin-gwtui_pom.xml +++ b/tools/maven/gerrit-plugin-gwtui_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.16 + 2.16.1-SNAPSHOT jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 89ae87bd95..fc353e4854 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.16 + 2.16.1-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 0b158b7c3a..e0182e7ef6 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "2.16" +GERRIT_VERSION = "2.16.1-SNAPSHOT"