Merge branch 'stable-2.15'
* stable-2.15:
Update to latest bazlets on stable-2.15
Update bazlets to latest revision on stable-2.14
Upgrade to latest bazlets on stable-2.14
Use latest bazlets
No-op merge done with `-s ours`.
Change-Id: I1f35abdb38cf4ded0cc3e474f74f77a180f33ec3
diff --git a/BUILD b/BUILD
index 58e65ad..c1abe9e 100644
--- a/BUILD
+++ b/BUILD
@@ -37,6 +37,7 @@
target_suffix = "__base",
deps = [
":gitiles__plugin_deps",
+ "//java/com/google/gerrit/server/restapi",
],
)
diff --git a/WORKSPACE b/WORKSPACE
index 97a3123..c572f0c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "d9abef15db0f934bfe9adcb40b0c475807fd12bf",
+ commit = "cbddbc2b9571b1d692fb823ba8791ccd60b52421",
# local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
index 61641d3..20e3cce 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
@@ -24,10 +24,10 @@
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.permissions.PermissionBackendException;
-import com.google.gerrit.server.project.ListProjects;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectJson;
import com.google.gerrit.server.project.ProjectState;
+import com.google.gerrit.server.restapi.project.ListProjects;
import com.google.gitiles.GitilesAccess;
import com.google.gitiles.GitilesUrls;
import com.google.gitiles.RepositoryDescription;