commit 79a362c964426e453c47442f360105720f3f47de
author David Pursehouse <dpursehouse@collab.net> Thu Mar 14 16:56:55 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Mar 14 16:56:55 2019 +0900
tree 17363e1205613ca414754c7c53b2fb1419ee3a85
parent 34de7c334b66119e6274f5603c0b046797a9d80c
parent db36d602c5ed070e7ca6fa930b0a412fa04c1f06

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.0
  Upgrade bazlets to latest stable-2.15
  Upgrade bazlets to latest stable-2.14
  Update bazlets to fix build with bazel 0.23

Change-Id: Ic82e310c4b5db8923cb12662b92a793f62079455

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 099ccac..b431b6b 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",
 )
 

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;