Merge branch 'stable-3.1' into master * stable-3.1: Bump Bazel version to 3.7.0 Upgrade bazlets to latest stable-3.0 to build with 3.0.13 API Change-Id: I574c95948c856584995a252a1d407a27ed7501aa
diff --git a/WORKSPACE b/WORKSPACE index fa2bfc6..439f0e4 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c", + commit = "0f81174e3d1b892a1342ebc75bb4bbb158ae0efe", #local_path = "/home/<user>/projects/bazlets", )
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;