commit 59043e395b8bc8cd5c83ff7850f30530627e9797
author Marco Miller <marco.miller@ericsson.com> Fri Feb 08 16:56:03 2019 -0500
committer Marco Miller <marco.miller@ericsson.com> Fri Feb 08 16:56:03 2019 -0500
tree dbb98fcf5161e9987cfc9bd255d79179c1e830c5
parent 6fc5ca15df06beb88b41ad2e7fac92b68f2e1671
parent 00d6a1102344b50741813edbd8b38ee46433e03e

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15 to build with 2.15.10 API

Change-Id: I8f32583beba1354538bbc06fe5294a77256f9fc8

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5e7f435..a08518b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "2b1d68959119920e5fa9bdfb9f0cf926bfef4929",
+    commit = "c15e64db2a87c0453427ff45f79d1ed3899b5d92",
     #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;