Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
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
Update bazlets to fix build with bazel 0.23
Change-Id: I3c7cfa39367c113e71ef8356097583e88b2cb7ce
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index a6c7cdb..d9ba75e 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/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java
index e83befc..d99d1e2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java
@@ -72,8 +72,7 @@
getArchiveDurationFromConfig(
Strings.nullToEmpty(cfg.getString("deleteArchivedReposAfter")));
this.protectedProjects =
- Arrays.asList(cfg.getStringList("protectedProject"))
- .stream()
+ Arrays.asList(cfg.getStringList("protectedProject")).stream()
.map(Pattern::compile)
.collect(toList());
}
