commit 364c6716f4a989a4f3c310fba3df1d0c05b7d8ae
author David Pursehouse <dpursehouse@collab.net> Wed Jul 03 20:10:35 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Jul 03 20:10:35 2019 +0900
tree f9b8828ecb4bcb8c0295bc59c450bdf8e2edee08
parent 79caae41adf86a4d2efecaed434085f4f4d97e1d
parent 546d40c2d6c03b40a8634a930f32454e51f277e5

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15
  Upgrade bazlets to latest stable-2.14
  Upgrade bazlets to latest stable-2.15
  Upgrade bazlets to latest stable-2.14

Change-Id: I661a491eef35c0066a97096dfa58e779b2865c18

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 392d6b5..f9078ba 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "d60efafe2fa2581d8b6f10aeb80beef5a77b8093",
+    commit = "62b278c85340707cf9f73df4127a9263ac5628c5",
     #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;