commit 7c914dc8cee91eaea03e46e7770a49d87f7ec95c
author David Pursehouse <dpursehouse@digital.ai> Tue May 26 11:17:35 2020 +0900
committer David Pursehouse <dpursehouse@digital.ai> Tue May 26 11:17:35 2020 +0900
tree 45e3cfff9e15c5bbd78272f229387448122c1970
parent cfcafe623cb34e660ec515d89b3c7ee85397171f
parent 948144cebf26ad1b02b12485fc792c30192e9e1b

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.19 API
  Align postgresql version used with gerrit core one
  Stop shipping core dependencies within plugin jar
  Sort CONDUCTOR_DEPS and EXECUTOR_DEPS alphabetically

Change-Id: I8f1bcdeb3d53ad32fd0eaf62b6c3a5fb88079ca0

BUILD

diff --git a/BUILD b/BUILD
index 75f3820..2885dda 100644
--- a/BUILD
+++ b/BUILD
@@ -7,23 +7,27 @@
     "gerrit_plugin",
 )
 
-EXECUTOR_DEPS = [
-    "@aopalliance//jar",
+CONDUCTOR_DEPS = [
+    "@postgresql//jar",
     "@dbcp//jar",
+    "@pool//jar",
+]
+
+EXECUTOR_DEPS = CONDUCTOR_DEPS + [
+    "@jgit//jar",
+    "@javaewah//jar",
     "@guava//jar",
+    "@guava-failureaccess//jar",
     "@guice//jar",
     "@guice-assistedinject//jar",
-    "@javaewah//jar",
     "@javax_inject//jar",
-    "@jgit//jar",
-    "@log4j-api//jar",
-    "@log4j-core//jar",
-    "@log4j-slf4j-impl//jar",
-    "@pool//jar",
-    "@postgresql//jar",
-    "@retry//jar",
+    "@aopalliance//jar",
     "@slf4j-api//jar",
     "@slf4j-ext//jar",
+    "@log4j-slf4j-impl//jar",
+    "@log4j-api//jar",
+    "@log4j-core//jar",
+    "@retry//jar",
 ]
 
 gerrit_plugin(
@@ -44,6 +48,7 @@
         ["src/main/resources/**/*"],
         exclude = ["src/main/resources/log4j2.xml"],
     ),
+    deps = CONDUCTOR_DEPS,
 )
 
 java_library(
@@ -86,11 +91,8 @@
     exports = EXECUTOR_DEPS + PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
         ":gc-conductor__plugin",
         ":gc-executor_lib",
-        "@byte-buddy//jar",
         "@duct_tape//jar",
         "@jna//jar",
-        "@mockito//jar",
-        "@objenesis//jar",
         "@testcontainers-database-commons//jar",
         "@testcontainers-jdbc//jar",
         "@testcontainers-postgres//jar",

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 2bdbdd5..26f5ced 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "22b242638bd36017790d94ffcc18a57f223bda2f",
+    commit = "97eef86854b0fb68b9287831f3075b6f6218ff41",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 0eedbad..c723af1 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -2,42 +2,11 @@
 
 def external_plugin_deps():
     maven_jar(
-        name = "mockito",
-        artifact = "org.mockito:mockito-core:2.28.2",
-        sha1 = "91110215a8cb9b77a46e045ee758f77d79167cc0",
-        deps = [
-            "@byte-buddy//jar",
-            "@byte-buddy-agent//jar",
-            "@objenesis//jar",
-        ],
-    )
-
-    BYTE_BUDDY_VERSION = "1.9.10"
-
-    maven_jar(
-        name = "byte-buddy",
-        artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
-        sha1 = "211a2b4d3df1eeef2a6cacf78d74a1f725e7a840",
-    )
-
-    maven_jar(
-        name = "byte-buddy-agent",
-        artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION,
-        sha1 = "9674aba5ee793e54b864952b001166848da0f26b",
-    )
-
-    maven_jar(
         name = "duct_tape",
         artifact = "org.rnorth.duct-tape:duct-tape:1.0.8",
         sha1 = "92edc22a9ab2f3e17c9bf700aaee377d50e8b530",
     )
 
-    maven_jar(
-        name = "objenesis",
-        artifact = "org.objenesis:objenesis:2.6",
-        sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
-    )
-
     SLF4J_VERS = "1.7.26"
 
     maven_jar(
@@ -74,8 +43,8 @@
 
     maven_jar(
         name = "postgresql",
-        artifact = "org.postgresql:postgresql:42.2.5",
-        sha1 = "951b7eda125f3137538a94e2cbdcf744088ad4c2",
+        artifact = "org.postgresql:postgresql:42.2.4",
+        sha1 = "dff98730c28a4b3a3263f0cf4abb9a3392f815a7",
     )
 
     maven_jar(
@@ -91,23 +60,29 @@
     )
 
     maven_jar(
-        name = "guava",
-        artifact = "com.google.guava:guava:26.0-jre",
-        sha1 = "6a806eff209f36f635f943e16d97491f00f6bfab",
+        name = "guava-failureaccess",
+        artifact = "com.google.guava:failureaccess:1.0.1",
+        sha1 = "1dcf1de382a0bf95a3d8b0849546c88bac1292c9",
     )
 
-    GUICE_VERS = "4.2.1"
+    maven_jar(
+        name = "guava",
+        artifact = "com.google.guava:guava:27.0.1-jre",
+        sha1 = "bd41a290787b5301e63929676d792c507bbc00ae",
+    )
+
+    GUICE_VERS = "4.2.2"
 
     maven_jar(
         name = "guice",
         artifact = "com.google.inject:guice:" + GUICE_VERS,
-        sha1 = "f77dfd89318fe3ff293bafceaa75fbf66e4e4b10",
+        sha1 = "6dacbe18e5eaa7f6c9c36db33b42e7985e94ce77",
     )
 
     maven_jar(
         name = "guice-assistedinject",
         artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
-        sha1 = "d327e4aee7c96f08cd657c17da231a1f4a8999ac",
+        sha1 = "c33fb10080d58446f752b4fcfff8a5fabb80a449",
     )
 
     maven_jar(
@@ -125,8 +100,8 @@
     maven_jar(
         name = "jgit",
         artifact =
-            "org.eclipse.jgit:org.eclipse.jgit:5.1.12.201910011832-r",
-        sha1 = "62c60aa985aa8dcfa6ad7308d130c319a1d01073",
+            "org.eclipse.jgit:org.eclipse.jgit:5.3.6.201910020505-r",
+        sha1 = "0b9085bd16c630412bfa50bcc509dcedfbbe16d3",
     )
 
     maven_jar(