Merge branch 'stable-3.1' * stable-3.1: Upgrade bazlets to latest stable-2.16 to build with 2.16.18 API Bump Bazel version to 3.1.0 Change-Id: Iacd07106a2da60ea479497ad12220d11226c3109
diff --git a/WORKSPACE b/WORKSPACE index dcb4416..c7d4bfd 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "fc1bfdf008c4b07e7cc4214fdacf25560276f9c4", + commit = "5c26af9e0374ede4cd67939be972adf6c4cda791", #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;