commit 9a500b5df92819c1e204069fde227a08e109358e
author David Pursehouse <dpursehouse@collab.net> Wed Sep 18 09:08:20 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Sep 18 09:08:20 2019 +0900
tree 4277c07bb754979ae9cbc08b17b50297749b9bb1
parent 42b2fcb61a7ac209118b9895787c0d8be0e91ae4
parent 858f22497b7c166fa516d388ab52b13a228d7711

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Switch required bazel version to 0.29.1
  Make build tests name consistent with stable-2.15

Change-Id: I2410095233226439e338aa0b7548f58921934b4b

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 141c115..b7df66f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "5f03aec7c72e743079ea2ecad5530f4684ca7d45",
+    commit = "6af2e084b72d38a3375925c4586ac2278ef95ee9",
     #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;