commit 9b78e2bf8a1dc2baa4df1ece957abfba5dcff10c
author David Pursehouse <dpursehouse@collab.net> Thu Mar 14 16:57:15 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Mar 14 16:57:15 2019 +0900
tree 1dc643c23bd749d384ea70bbeca81d66d6efc3cc
parent 70f2dd685f8e0a41df8ce40be13c247a8f84673e
parent 6dbf8382d83aa479cce748097f788d1edbcdc1bb

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

Change-Id: I3aecd098c949e155029277b51c9f9553984aee70

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 8cc1197..63408b8 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",

src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
index fed95e7..da5bed1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
@@ -50,10 +50,7 @@
     HttpPost post = new HttpPost(remote.getUrl());
     post.addHeader("Content-Type", MediaType.JSON_UTF_8.toString());
     post.setConfig(getConfig(remote));
-    request
-        .headers
-        .entrySet()
-        .stream()
+    request.headers.entrySet().stream()
         .forEach(
             e -> {
               post.addHeader(e.getKey(), e.getValue());