commit 45c37cc6353516cec64dc3781f3f510c795233af
author David Pursehouse <dpursehouse@collab.net> Sat Jun 15 10:52:24 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Sat Jun 15 10:52:24 2019 +0900
tree 671904d979ee6fbfe0fbf71c530f9c3cf253f80b
parent 56f8eb114e260f4c2a8e99c6f6de06a219f5d503
parent e143192fb2dfa362f1f2c3f715c1ce6c33c5e02f

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Align tests target name prefix with plugin name
  Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API

Change-Id: I05c97b91269053f4b3784606ed47244ba34f54e9

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index c45a205..1a87c03 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "a2830809bc277f55e094e8203fee04d9dc802e51",
+    commit = "d100b6aad6b37e7db8fa141020c882dc97fb7723",
     #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;