Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Upgrade testcontainers to 1.12.5
Change-Id: Ie017988456930e9aa72d06639c7ae2836ef9cb65
diff --git a/BUILD b/BUILD
index cb02518..2885dda 100644
--- a/BUILD
+++ b/BUILD
@@ -17,6 +17,7 @@
"@jgit//jar",
"@javaewah//jar",
"@guava//jar",
+ "@guava-failureaccess//jar",
"@guice//jar",
"@guice-assistedinject//jar",
"@javax_inject//jar",
@@ -90,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",
diff --git a/WORKSPACE b/WORKSPACE
index d593074..2f67e61 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "577450c73780560972f8a1a92c91410192ff7224",
+ commit = "8ac9d00b8f12b7f61ff360c47a5bd87d7f75f4b5",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index ba7e050..4cf2cb3 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.7",
sha1 = "a26b5d90d88c91321dc7a3734ea72d2fc019ebb6",
)
- maven_jar(
- name = "objenesis",
- artifact = "org.objenesis:objenesis:2.6",
- sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
- )
-
SLF4J_VERS = "1.7.26"
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(
