commit 8a2e64f2a44d98ced6e9862aa45f327f81289bc6
author Marco Miller <marco.miller@ericsson.com> Thu Jul 30 11:26:29 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Jul 30 11:26:29 2020 -0400
tree 63cc3cd8a71db3dae64df7f8806d5fb6e62af5cf
parent d8677f4155f596aba3ffd247d58ff1fcc30b7674
parent b70aed9d55f42a3ad91d2458f58b72623f7d1a7f

Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.8 API
  Move plugin configuration to a separate file
  Upgrade bazlets to latest stable-3.0 to build with 3.0.12 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API

Change-Id: Ic4e5b3bb816673183fc5dc8542546fb6936c19a8

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index fa2bfc6..9cdc311 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
+    commit = "74f9d8e76d5014d218ae6fe55127a5288c9a32c3",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

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;