commit 7ab3e3e0887020bd503f28c3ffe73e445068a149
author David Pursehouse <dpursehouse@collab.net> Fri Apr 12 10:42:07 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Apr 12 10:42:07 2019 +0900
tree 319c8f80683c368da6bb68f48a514a7705fe1ca8
parent 9d13446e533c3442d7478008049f8539e75d1439
parent 8521f7036145fe36ecee19d2bdf432be27f43427

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I20cc94e38f3823279efdffde58a763fc692c15d2

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 173587f..da4b2af 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8386b3fbf80e375f0a10c8386c0a8dfe260c5c1b",
+    commit = "c827ba79413585ab9dfc1bbd0d7f609eedd6aa80",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
index e728713..d297b26 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
@@ -21,7 +21,7 @@
 import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectState;
-import com.google.gwtexpui.server.CacheHeaders;
+import com.google.gerrit.util.http.CacheHeaders;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.io.IOException;