Merge branch 'stable-2.15'
* stable-2.15:
Upgrade mockito-core to 2.25.1
Upgrade bazlets to latest stable-2.15 to build with 2.15.12 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.19 API
Format Java files with google-java-format 1.7
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: I2f498e491746c95616fbc00b6b2a9295deaa3f52
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 8cc1197..38c6d9c 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.1",
+ sha1 = "e8fa2864b65c0b6fbb20daa436a94853bcd17e5e",
deps = [
"@byte-buddy//jar",
"@byte-buddy-agent//jar",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/IndexUpdateHandler.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/IndexUpdateHandler.java
index 80e26c7..ed12dc3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/IndexUpdateHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/IndexUpdateHandler.java
@@ -74,8 +74,7 @@
}
private boolean verifyAllTasksCompleted(List<Future<Boolean>> executorOutput) {
- return executorOutput
- .stream()
+ return executorOutput.stream()
.allMatch(
task -> {
try {
