commit d40a379ec8949c172bf0d111eb66426c46e2fdd6
author Marco Miller <marco.miller@ericsson.com> Wed Feb 20 15:55:40 2019 -0500
committer Marco Miller <marco.miller@ericsson.com> Wed Feb 20 16:15:02 2019 -0500
tree 4010319ceb427ca88135c95ac6cce07e6ed86c1a
parent b1cdabc3acb81bf0c148040de9acda8bd3d6addc
parent 2a6e6d7aaa6638418060684bdb5614ac8c45fc92

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I9626e93f61badaf8e9078d360ce19c2d7017bc51

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5e7f435..38a740f 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",
 )
 

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;