commit 0a2f64906af2f18780cf13245aa401124721dc3e
author Marco Miller <marco.miller@ericsson.com> Mon Feb 10 15:15:21 2020 -0500
committer Marco Miller <marco.miller@ericsson.com> Mon Feb 10 15:15:21 2020 -0500
tree 0d248e3ad921d31052f36de6072833ea75df3060
parent 9cc1e39e2208877d37b42230d1688ee3af7c03de
parent 176a0a43eebf5b42e0dc8d6cca1c4851801b5a00

Merge branch 'stable-3.1'

* stable-3.1:
  Bump required Bazel version to 2.1.0

Change-Id: I18ecc81953c6084a8828d8a29d93dd9be19c5fa7

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 6cebcaf..512b4fd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "300de940c226c4ef7f0ce4baa90e278ae0fa840c",
+    commit = "f30a992da9fc855dce819875afb59f9dd6f860cd",
     #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/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
index a6e9ac1..679383b 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
@@ -16,7 +16,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.gerrit.acceptance.GerritConfig;
+import com.google.gerrit.acceptance.config.GerritConfig;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.TestPlugin;
 import org.junit.Test;