commit b35a5b7ead58646708d6c87da40804d443a4398f
author Marco Miller <marco.miller@ericsson.com> Thu Sep 05 15:36:37 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Sep 05 15:39:56 2019 -0400
tree a9893ea5203e08b660a3622c033c47c4d0c1efcc
parent 04c7c00131546725ecc30657bbfec3f75934a565
parent 9ef3d7ed7403900aaa23099be2599343cb406d63

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ia1adf1f501260da844a6ea8a2fb158a8bcd8020e

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index fa08aa9..649632c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "4b3ce19d8d18d9f7df56a06532723b91ea6949d0",
+    commit = "3df1fac2202ac2a42cec61fac8c502178c9af391",
     #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;