commit a2a63d6f3d0eb08145360c3afbde025866eccfaa
author Marco Miller <marco.miller@ericsson.com> Sun Mar 17 19:05:57 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Sun Mar 17 19:05:57 2019 -0400
tree 17363e1205613ca414754c7c53b2fb1419ee3a85
parent 79a362c964426e453c47442f360105720f3f47de
parent a1fe02160c5352ca781cc3aa6c6cc94d033f96d1

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15 to build with 2.15.12 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.19 API

Change-Id: I3e4a1521eae0985ba5acb3e7d05903388a895d01

WORKSPACE

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