commit 7a12f5b71cac0718f3479f0a3d9321c420eee04a
author Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:55:10 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:55:10 2018 -0400
tree 03761bef6eb4cba7f223e64e2e00cc569492d7ca
parent f3f897ccbd407766a30660b4adf17262572480e6
parent c12ec2088a71da446f576eb024142824ca2634e1

Merge branch 'stable-2.15'

* stable-2.15:
  bazlets: Replace native.git_repository with skylark rule
  Harmonize external dependency names to use hyphen
  Upgrade mockito to 2.23.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.15 API
  Update bazlets to latest stable-2.15 and build with released 2.15.4 API

Change-Id: I642de13da2725a7dbba6ee08795ba302c5273b97

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 1b8a28a..cae5727 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d3fd710ea4ca44805bb8c858d72b53bd3a500f3",
+    commit = "3a53199198db3f49a43b7708c2c3352670393717",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
 #Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
 load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
+    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+    "gerrit_api_maven_local",
 )
 
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
+#)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()
 
 load("//:external_plugin_deps.bzl", "external_plugin_deps")
 

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;