Fix compilation issues
the `//lib/testcontainers` and its transitive dependencies were
removed by I08a1e7a0
Stop relying on missing gerrit lib dependencies and explicitly add
testcontainers directly in the external plugin dependencies.
Bug: Issue 15839
Change-Id: I256203be8caf524a6903b796441c55269941dfd5
diff --git a/BUILD b/BUILD
index 40c9a43..e9be8bb 100644
--- a/BUILD
+++ b/BUILD
@@ -52,7 +52,6 @@
tags = ["events-gcloud-pubsub"],
deps = [
":events-gcloud-pubsub__plugin_test_deps",
- "//lib/testcontainers",
"@api-common//jar",
"@events-broker//jar",
"@gax-grpc//jar",
@@ -87,10 +86,13 @@
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":events-gcloud-pubsub__plugin",
- "//lib/jackson:jackson-annotations",
- "//lib/testcontainers",
- "//lib/testcontainers:docker-java-api",
- "//lib/testcontainers:docker-java-transport",
+ "@jackson-annotations//jar",
+ "@testcontainers//jar",
+ "@docker-java-api//jar",
+ "@docker-java-transport//jar",
+ "@duct-tape//jar",
+ "@visible-assertions//jar",
+ "@jna//jar",
"@testcontainers-gcloud//jar",
"@grpc-api//jar",
"@gax-grpc//jar",
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 3416ba6..d0720b6 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -49,10 +49,56 @@
sha1 = "309fe8cc08c46593d9990d4e5c448cc85e5a62b0",
)
+ TESTCONTAINERS_VERSION = "1.15.3"
+
+ maven_jar(
+ name = "testcontainers",
+ artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
+ sha1 = "95c6cfde71c2209f0c29cb14e432471e0b111880",
+ )
+
maven_jar(
name = "testcontainers-gcloud",
- artifact = "org.testcontainers:gcloud:1.15.2",
- sha1 = "0ad02bb83edc818469e1080995cae409f5d40694",
+ artifact = "org.testcontainers:gcloud:" + TESTCONTAINERS_VERSION,
+ sha1 = "a2908fc7ed7f09df9124314114757314612826ff",
+ )
+
+ maven_jar(
+ name = "duct-tape",
+ artifact = "org.rnorth.duct-tape:duct-tape:1.0.8",
+ sha1 = "92edc22a9ab2f3e17c9bf700aaee377d50e8b530",
+ )
+
+ maven_jar(
+ name = "visible-assertions",
+ artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.2",
+ sha1 = "20d31a578030ec8e941888537267d3123c2ad1c1",
+ )
+
+ maven_jar(
+ name = "jna",
+ artifact = "net.java.dev.jna:jna:5.5.0",
+ sha1 = "0e0845217c4907822403912ad6828d8e0b256208",
+ )
+
+ DOCKER_JAVA_VERS = "3.2.8"
+
+ maven_jar(
+ name = "docker-java-api",
+ artifact = "com.github.docker-java:docker-java-api:" + DOCKER_JAVA_VERS,
+ sha1 = "4ac22a72d546a9f3523cd4b5fabffa77c4a6ec7c",
+ )
+
+ maven_jar(
+ name = "docker-java-transport",
+ artifact = "com.github.docker-java:docker-java-transport:" + DOCKER_JAVA_VERS,
+ sha1 = "c3b5598c67d0a5e2e780bf48f520da26b9915eab",
+ )
+
+ maven_jar(
+ name = "jackson-annotations",
+ artifact = "com.fasterxml.jackson.core:jackson-annotations:2.10.3",
+ sha1 = "0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7",
)
maven_jar(
