Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade testcontainers to 1.12.3
Change-Id: I1c3e6e0d0b8863b6965d9369ad3d9b78083dc3e3
diff --git a/WORKSPACE b/WORKSPACE
index c744898..3632cd6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "ae1cd231b0262b2738e6c0593eb3c504209ad4f5",
+ commit = "ec989bb514e39447764057c60d3f9959bff8e153",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index ceca8a6..c6e8931 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -92,22 +92,22 @@
maven_jar(
name = "guava",
- artifact = "com.google.guava:guava:25.1-jre",
- sha1 = "6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4",
+ artifact = "com.google.guava:guava:26.0-jre",
+ sha1 = "6a806eff209f36f635f943e16d97491f00f6bfab",
)
- GUICE_VERS = "4.2.0"
+ GUICE_VERS = "4.2.1"
maven_jar(
name = "guice",
artifact = "com.google.inject:guice:" + GUICE_VERS,
- sha1 = "25e1f4c1d528a1cffabcca0d432f634f3132f6c8",
+ sha1 = "f77dfd89318fe3ff293bafceaa75fbf66e4e4b10",
)
maven_jar(
name = "guice-assistedinject",
artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
- sha1 = "e7270305960ad7db56f7e30cb9df6be9ff1cfb45",
+ sha1 = "d327e4aee7c96f08cd657c17da231a1f4a8999ac",
)
maven_jar(
@@ -125,8 +125,8 @@
maven_jar(
name = "jgit",
artifact =
- "org.eclipse.jgit:org.eclipse.jgit:4.11.9.201909030838-r",
- sha1 = "3bc74ffed6186bf2fc37404216e5ef16f904d0b0",
+ "org.eclipse.jgit:org.eclipse.jgit:5.1.11.201909031202-r",
+ sha1 = "5aa0e29d7b4db4e6c17e3ddee9bdc8d578f02ef0",
)
maven_jar(
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
index e8aba71..43803e4 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
@@ -197,7 +197,7 @@
private Collection<Ref> getAllRefs(FileRepository repo) throws IOException {
RefDatabase refdb = repo.getRefDatabase();
- Collection<Ref> refs = refdb.getRefs(RefDatabase.ALL).values();
+ Collection<Ref> refs = refdb.getRefs();
List<Ref> addl = refdb.getAdditionalRefs();
if (!addl.isEmpty()) {
List<Ref> all = new ArrayList<>(refs.size() + addl.size());
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
index fe41af0..4cd7417 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
@@ -19,9 +19,9 @@
import com.ericsson.gerrit.plugins.gcconductor.GcQueue;
import com.ericsson.gerrit.plugins.gcconductor.RepositoryInfo;
import com.google.common.base.Strings;
-import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.server.util.time.TimeUtil;
import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
