commit f9afa2fc753317947cfeaf3f60c3845bb27e14b1
author Marco Miller <marco.miller@ericsson.com> Tue Oct 30 14:50:58 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Oct 30 14:50:58 2018 -0400
tree d49264e5472a0c6ac002491c9a724d0e19dd842e
parent 081cdb032ffbb9455913786ebb4600a233420387
parent 97ff618e7a821513557ebc33738ce371e8630819

Merge branch 'stable-2.15'

* stable-2.15:
  Upgrade bazlets to latest stable-2.15 to build with 2.15.6 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.16 API
  Remove remnants of buck-based build
  Align Eclipse compiler settings with core Gerrit's
  WORKSPACE: Make commented out lines spaces indent consistent

Change-Id: Ic45a49274242d3374b73637f6cd676c534da9f93

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 8dfdc12..bee1187 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "087da1f6ca119ad5c4bc443926426ddf44dcde3a",
+    commit = "e4662688b3f482cf5789b27a1ea726e8d0aabfc8",
     #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;