commit 0031f773675561d1f42de516963ad7067ca1833f
author Marco Miller <marco.miller@ericsson.com> Tue Jun 09 14:58:00 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Jun 09 14:58:00 2020 -0400
tree b4ac0554fab409568377b0bf2a6a6f84d987d5d3
parent 13a8c94fa165c2bd521452d654ee34128197eb44
parent a7f3cbd613d00d5f2f02e86565ef408d4d031373

Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.6 API
  Upgrade bazlets to latest stable-3.0 to build with 3.0.10 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.21 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.19 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.21 API

Change-Id: I4e9950901ca25a62849f5f6261dc2f5b4bfc4a7f

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 9bfea8b..698bdfa 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "69ae6ee516ec1cc51d0a07fe4419a325eb9063ce",
+    commit = "5c26af9e0374ede4cd67939be972adf6c4cda791",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatIT.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatIT.java b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatIT.java
index 98d87ad..516db73 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatIT.java
@@ -16,7 +16,7 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import com.google.gerrit.acceptance.GlobalPluginConfig;
+import com.google.gerrit.acceptance.config.GlobalPluginConfig;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.NoHttpd;
 import com.google.gerrit.acceptance.TestPlugin;