commit 49949d54aa32239f5b5aa209df1315d5525c54de
author David Pursehouse <dpursehouse@collab.net> Sat Mar 16 20:50:02 2019 +0000
committer David Pursehouse <dpursehouse@collab.net> Sat Mar 16 20:50:02 2019 +0000
tree c22b617459fef41d1560ffa62dae6217687e0821
parent 0c74b68d98db89266e26bba7aee2fdd674cd9a6b
parent 91acc4ec67c9f4ae0598a9dbd55ad053fcba536b

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Deps: Update testcontainers to version 1.10.7

Change-Id: Ic03d7482261113e0e17ac5d128e2064bee1eea9b

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 91492f2..6e6adf1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "9c84d2870bf8d3f51685a289a1fc9edc3bf9dc89",
+    commit = "86562a4c8c2e885aac89eafab34a90571be2ef09",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index e522b5e..fb3cfcf 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.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;