commit 7b4b476df66896f7446fbb9514da79980c6588eb
author Marco Miller <marco.miller@ericsson.com> Mon May 06 14:02:19 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Mon May 06 14:20:33 2019 -0400
tree fc8212cb39b23e4fb3110fb33ed53dbab4aca52b
parent b6cd4f39635e2d3c03ce1ca18dbde3b4e769f38d
parent a8149b1db91954624c0ab53d3a88666645f092ec

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade bazlets to latest master to build with 3.0.0-rc2 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.8 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.13 API

Switch from release to snapshot plugin API use, since this is master
branch anyway. Without this switch, some of the plugin test code failed
to build locally, out of missing BranchNameKey.

Change-Id: Ic2318aab808f252a854ba03d9c753bffb6785201

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index eeb6ef8..c39a221 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,19 +8,19 @@
 )
 
 # Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
 #load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
 #)
 
+# Snapshot Plugin API
+load(
+    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+    "gerrit_api_maven_local",
+)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()
 
 # Load snapshot Plugin API
-#gerrit_api_maven_local()
+gerrit_api_maven_local()

src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
index fdc7fe4..74d5c07 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
@@ -30,7 +30,7 @@
 import com.google.gerrit.acceptance.TestAccount;
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.extensions.common.AccountInfo;
-import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.BranchNameKey;
 import com.google.gerrit.reviewdb.client.RefNames;
 import java.util.Collection;
 import org.eclipse.jgit.lib.Config;
@@ -135,7 +135,7 @@
 
     testRepo.reset(oldHead);
 
-    createBranch(Branch.nameKey(project, "other-branch"));
+    createBranch(BranchNameKey.create(project, "other-branch"));
 
     // Create a change that matches the filter section.
     createChange("refs/for/master");
@@ -168,7 +168,7 @@
 
     testRepo.reset(oldHead);
 
-    createBranch(Branch.nameKey(project, "other-branch"));
+    createBranch(BranchNameKey.create(project, "other-branch"));
 
     // Create a change that doesn't match the filter section.
     createChange("refs/for/master");