Merge branch 'stable-3.0' * stable-3.0: Replace bazel-genfiles with bazel-bin in documentation Upgrade bazlets to latest stable-3.0 to build with 3.0.3 API Bump bazel version to 1.0.0 Upgrade bazlets to latest stable-2.16 to build with 2.16.12 API Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API Change-Id: Idf379a76fcb8545e48d3384946e1301d91924925
diff --git a/WORKSPACE b/WORKSPACE index 1f5f4af..ebcdc58 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "29ba75f790c68ae2c233a67f7ce1e58e04201ce2", + commit = "acfed42f6ad6863b1906da240b564b6f714e6b75", #local_path = "/home/<user>/projects/bazlets", )
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..7f34ce6 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
@@ -23,9 +23,9 @@ import com.ericsson.gerrit.plugins.eventslog.EventsLogException; import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.events.ProjectEvent; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -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) {
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..9d8b5cb 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
@@ -29,7 +29,7 @@ import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import com.google.gerrit.server.events.ProjectEvent; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -400,7 +400,7 @@ @Override public Project.NameKey getProjectNameKey() { - return new Project.NameKey(project); + return Project.nameKey(project); } }