Merge branch 'stable-2.16'
* stable-2.16:
Format Java files with google-java-format 1.7
Upgrade bazlets to latest stable-2.16
Upgrade mockito-core to 2.25.0
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Update bazlets to fix build with bazel 0.23
Change-Id: I4c72fddbab04cede2b3147842213477c4471ce29
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 5bfbd30..5d3f1a4 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
def external_plugin_deps():
maven_jar(
name = "mockito",
- artifact = "org.mockito:mockito-core:2.24.5",
- sha1 = "599509fe319bd9e39559b8f987bee5d4b77167e4",
+ artifact = "org.mockito:mockito-core:2.25.0",
+ sha1 = "1fcf2f6944d69b6f39cd579718d8b5395a97836b",
deps = [
"@byte-buddy//jar",
"@byte-buddy-agent//jar",
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
index 50e769c..2dc6271 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
@@ -506,9 +506,7 @@
}
private void emptyQueue() throws GcQueueException {
- queue
- .list()
- .stream()
+ queue.list().stream()
.map(RepositoryInfo::getPath)
.forEach(
repository -> {
