commit 81b58fa60afc5d2e65294326bd9cc2ab3b721024
author David Pursehouse <dpursehouse@collab.net> Thu Nov 07 15:59:19 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Nov 07 15:59:19 2019 +0900
tree a528d51207e103fe1e6d883ed8418f214a668fad
parent f630c6aecfbb6741235a591d4b40594a6501ffba
parent a6ac28325539aad06505410759cfb2d9602beae6

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15 to build with 2.15.18 API
  Bazel: Migrate workspace status script to python
  Upgrade bazlets to latest stable-2.15
  Upgrade bazlets to latest stable-2.14

Change-Id: Ieebdab2f5969cc48973d4dc60a807ceeefac7931

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 6f649b7..e62d3be 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ec949feac1b9dae6cc2c8c25d254f34924c54296",
+    commit = "e1360b49f90930e280f6a43380ab533705c85446",
     #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 2a370d4..ea8a4dc 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
@@ -22,7 +22,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;