commit 3f042174611aaa52bfd42991581289a4ea2a5584
author Marco Miller <marco.miller@ericsson.com> Thu Jul 30 11:26:32 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Jul 30 11:26:32 2020 -0400
tree eb6fd1120a4b857145d4f3aa73dad82e9cf7b7fe
parent f0750743a6cd647624edd1dca718bc6b0ea3f652
parent 311b169caa01945e7b4b0221c48cde3d682d2693

Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.8 API
  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: I3ef63c9bb863cbb8d1dfffb36423fef9d92dbd49

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5811677..56ab23a 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/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;