commit 8b616541ad53ad042a493db4c557001b50001367
author Marco Miller <marco.miller@ericsson.com> Wed Feb 20 15:55:38 2019 -0500
committer Marco Miller <marco.miller@ericsson.com> Wed Feb 20 16:14:28 2019 -0500
tree 031101c9859d7ed5d50dc9d95576e56dfd7cb0be
parent 02135b3464b0cbbc2f9af5a6c5b5b13b80e08858
parent 0b89130615ccf1a4c3f362ea815d781e747f3b1e

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.24.5

Change-Id: I3f173c816941f80986084821a44452e6cb52f526

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a99b0f7..04c74f7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "2b1d68959119920e5fa9bdfb9f0cf926bfef4929",
+    commit = "b084bd74743f4303971a2a057bcea4f3352ddf4e",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 2faba2f..86d3bfe 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -78,22 +78,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(
@@ -111,8 +111,8 @@
     maven_jar(
         name = "jgit",
         artifact =
-            "org.eclipse.jgit:org.eclipse.jgit:4.9.8.201812241815-r",
-        sha1 = "dedb5d05a952551dc465611ebde3819d86bb22fc",
+            "org.eclipse.jgit:org.eclipse.jgit:5.1.5.201812261915-r",
+        sha1 = "e64c71932a2a8fdc2b86cf7d5d61c3399c64b8b1",
     )
 
     maven_jar(

src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java

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;