commit 91736d463f19c3310ec04a3f836b5e94e2d4bfdb
author David Pursehouse <dpursehouse@collab.net> Tue Mar 19 17:09:45 2019 +0000
committer David Pursehouse <dpursehouse@collab.net> Tue Mar 19 17:09:45 2019 +0000
tree 5d3e5daa3a166c980f37b6c1ed507849a4754ea2
parent 35b3addfd1b3ef132d391a8f5f0466337d71325a
parent 27f3a419a2d0c9fd02844f8b549b1a1d20152bd8

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: Idab15c32856e07e531ad915b87f70634c8442dd0

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 93e65d9..4352be0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "f4fcc606a6afa8ce27a013bcf62e495a5ec2505c",
+    commit = "5c1e201c6835e56a69a980c72206431e2a9d7d80",
     #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;