commit db827a5a6e18b0ed5030c9d9f2e731242d76d812
author Marco Miller <marco.miller@ericsson.com> Mon Jun 17 10:55:40 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Mon Jun 17 10:55:40 2019 -0400
tree c7f34fafd41a23af806534dbaaea49766d46c83a
parent b450e905cf76e48c7d9b3f98de7ab6e6ef2a9820
parent a2557ceeced3cd217960cbdfaaf15e192d163259

Merge branch 'stable-3.0'

* stable-3.0:
  Bazel: Consume mockito library from plugin API
  Align tests target name prefix with plugin name
  Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API

Change-Id: I01a02302e4221cd1ee4a2367c43d5f7adc61b731

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 9e379c1..3078b94 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1d381f01c853e2c02ae35430a8e294e485635d62",
+    commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
index 6289c2d..ecf8ab3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -116,7 +116,7 @@
       try {
         permissionBackend
             .currentUser()
-            .project(new Project.NameKey(projectName))
+            .project(Project.nameKey(projectName))
             .check(ProjectPermission.ACCESS);
         entries.addAll(entry.getValue());
       } catch (AuthException e) {

src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
index 68b9801..8a0015a 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -400,7 +400,7 @@
 
     @Override
     public Project.NameKey getProjectNameKey() {
-      return new Project.NameKey(project);
+      return Project.nameKey(project);
     }
   }