Merge branch 'stable-2.16'
* stable-2.16:
Upgrade bazlets to latest stable-2.16 to build with 2.16.6 API
Add the standard LICENSE file
Documentation: Fix the in-tree bazel test command
Start dockerized postgres server in junit test using testcontainers
PostgresQueueTest#testList: Tolerate up to 1s skew in queued time stamp
Upgrade bazlets to latest stable-2.15 to build with 2.15.11 API
Change-Id: I7829c03bc605de0b5fd0c954dd74b13c3f08197b
diff --git a/BUILD b/BUILD
index 07bf406..1dac6b9 100644
--- a/BUILD
+++ b/BUILD
@@ -16,6 +16,7 @@
"@jgit//jar",
"@javaewah//jar",
"@guava//jar",
+ "@guava-failureaccess//jar",
"@guice//jar",
"@guice-assistedinject//jar",
"@javax_inject//jar",
diff --git a/WORKSPACE b/WORKSPACE
index 8e34c11..22a46b7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f7986f2d3e76ae0ca12a8c43ee91205725bd95e2",
+ commit = "738ddb525810a50c792736d7115a1bb5289bd3d3",
#local_path = "/home/<user>/projects/bazlets",
)
# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index d518489..5bfbd30 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -91,23 +91,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 +131,8 @@
maven_jar(
name = "jgit",
artifact =
- "org.eclipse.jgit:org.eclipse.jgit:5.1.5.201812261915-r",
- sha1 = "e64c71932a2a8fdc2b86cf7d5d61c3399c64b8b1",
+ "org.eclipse.jgit:org.eclipse.jgit:5.2.1.201812262042-r",
+ sha1 = "34914e63e1463e40ba40e2e28b0392993ea3b938",
)
maven_jar(