Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade bazlets to latest stable-2.16 to build with 2.16.15 API Change-Id: Iec4f36f697f667bf9296c73023977c42db3443bf
diff --git a/WORKSPACE b/WORKSPACE index e40eb81..67b4e2e 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "59529f046a5cb855d9fe3ee87110d53305ec69b9", + commit = "7111147b7cf9d9cd4d61f414c815f736f56f0de0", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 8f9e7d2..776e937 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -1,13 +1,13 @@ load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar") -JGIT_VERSION = "5.1.12.201910011832-r" +JGIT_VERSION = "5.3.5.201909031855-r" REPO = MAVEN_CENTRAL def external_plugin_deps(): maven_jar( name = "jgit-http-apache", artifact = "org.eclipse.jgit:org.eclipse.jgit.http.apache:" + JGIT_VERSION, - sha1 = "92ad62799dd7eb02cc8805f2e297714cc3bb5149", + sha1 = "f4bd0890486e312bbd25a72a6241fe6f7b8343f7", repository = REPO, unsign = True, exclude = [ @@ -19,7 +19,7 @@ maven_jar( name = "jgit-lfs", artifact = "org.eclipse.jgit:org.eclipse.jgit.lfs:" + JGIT_VERSION, - sha1 = "bb4972c6e127c615c4b9183f95414ff2a20916cf", + sha1 = "89f5fb379f0def6a6d507b4ed8c67fb5c3006713", repository = REPO, unsign = True, exclude = [ @@ -31,7 +31,7 @@ maven_jar( name = "jgit-lfs-server", artifact = "org.eclipse.jgit:org.eclipse.jgit.lfs.server:" + JGIT_VERSION, - sha1 = "b2d1e48f9daddc09e072e422c151384e845c1612", + sha1 = "cd4e97da698b0fff2ed54dd07a4daba065e6e3dd", repository = REPO, unsign = True, exclude = [
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java index 8982dbe..992dada 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java +++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsApiServlet.java
@@ -22,9 +22,9 @@ import static com.google.gerrit.server.permissions.ProjectPermission.PUSH_AT_LEAST_ONE_REF; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.ProjectUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.ProjectUtil; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; @@ -81,7 +81,7 @@ throw new LfsException("no repository at " + pathInfo); } String projName = matcher.group(1); - Project.NameKey project = Project.NameKey.parse(ProjectUtil.stripGitSuffix(projName)); + Project.NameKey project = Project.nameKey(ProjectUtil.stripGitSuffix(projName)); ProjectState state = projectCache.get(project); if (state == null || state.getProject().getState() == HIDDEN) { throw new LfsRepositoryNotFound(project.get());
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksAction.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksAction.java index 4b6afb4..32536f7 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksAction.java +++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksAction.java
@@ -22,10 +22,10 @@ import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.ProjectUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.ProjectUtil; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackend.ForProject; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -100,7 +100,7 @@ throws LfsException, IOException; protected ProjectState getProject(String name) throws LfsRepositoryNotFound { - Project.NameKey project = Project.NameKey.parse(ProjectUtil.stripGitSuffix(name)); + Project.NameKey project = Project.nameKey(ProjectUtil.stripGitSuffix(name)); ProjectState state = projectCache.get(project); if (state == null || state.getProject().getState() == HIDDEN) { throw new LfsRepositoryNotFound(project.get());