commit b9840885ab12e2a22374b9efa1472897d3b845f1
author Hugo Arès <hugo.ares@ericsson.com> Tue Apr 10 08:48:58 2018 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Tue Apr 10 08:49:40 2018 -0400
tree d3f95badf736c1966003bd3ce7f3c4e59c177eb2
parent 5ec5a73b271501492277ac2e92141036d903323f
parent 6cf0c70ebaabc47695fe8b36b7be355cf1feadcf

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update bazlets to latest stable-2.14 to use 2.14.7 release API
  Upgrade Mockito to 2.15.0
  Format all Java files with google-java-format
  SQLStoreTest: Fix Spotbugs warning about return value ignored
  SQLEntryTest: Suppress 'unlikely argument type' warning
  SQLStoreTest: Reduce visibility of tearDown method
  Update bazlets to latest revision on stable-2.14

Change-Id: Id96f3c13f3e2fae4a3cd132e5c114d7a201d6bb0

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 135e5f6..e26b362 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,22 +3,31 @@
 def external_plugin_deps():
   maven_jar(
     name = "mockito",
-    artifact = "org.mockito:mockito-core:2.5.0",
-    sha1 = "be28d46a52c7f2563580adeca350145e9ce916f8",
+    artifact = "org.mockito:mockito-core:2.15.0",
+    sha1 = "b84bfbbc29cd22c9529409627af6ea2897f4fa85",
     deps = [
       "@byte_buddy//jar",
+      "@byte_buddy_agent//jar",
       "@objenesis//jar",
     ],
   )
 
+  BYTE_BUDDY_VER = "1.7.9"
+
   maven_jar(
     name = "byte_buddy",
-    artifact = "net.bytebuddy:byte-buddy:1.5.12",
-    sha1 = "b1ba1d15f102b36ed43b826488114678d6d413da",
+    artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VER,
+    sha1 = "51218a01a882c04d0aba8c028179cce488bbcb58",
+  )
+
+  maven_jar(
+    name = "byte_buddy_agent",
+    artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VER,
+    sha1 = "a6c65f9da7f467ee1f02ff2841ffd3155aee2fc9",
   )
 
   maven_jar(
     name = "objenesis",
-    artifact = "org.objenesis:objenesis:2.4",
-    sha1 = "2916b6c96b50c5b3ec4452ed99401db745aabb27",
+    artifact = "org.objenesis:objenesis:2.6",
+    sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
   )

src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
index 4d0fdc4..694a05f 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
@@ -66,6 +66,7 @@
     assertThat(entry2.compareTo(entry1)).isEqualTo(-1);
   }
 
+  @SuppressWarnings("unlikely-arg-type")
   @Test
   public void testEquals() throws Exception {
     assertThat(entry1.equals(null)).isFalse();

src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
index caaf3bd..bb300f7 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -110,7 +110,7 @@
     store.storeEvent(mockEvent);
     List<String> events = store.queryChangeEvents(GENERIC_QUERY);
     String json = new Gson().toJson(mockEvent);
-    assertThat(events).containsExactly(json);
+    assertThat(events).containsExactly(json).inOrder();
   }
 
   @Test
@@ -245,7 +245,7 @@
     Gson gson = new Gson();
     String json = gson.toJson(mockEvent);
     String json2 = gson.toJson(mockEvent2);
-    assertThat(events).containsExactly(json, json2);
+    assertThat(events).containsExactly(json, json2).inOrder();
   }
 
   @Test