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 15844
Change-Id: I805b736631d9791b103f9338cfec0665f5a064bb
diff --git a/BUILD b/BUILD
index b201250..2aa6678 100644
--- a/BUILD
+++ b/BUILD
@@ -42,9 +42,11 @@
"@awssdk-protocol-core//jar",
"@awssdk-query-protocol//jar",
"@commons-codec//jar",
+ "@commons-lang//jar",
"@events-broker//jar:neverlink",
"@io-netty-all//jar",
"@jackson-annotations//jar",
+ "@jackson-core//jar",
"@jackson-databind//jar",
"@jackson-dataformat-cbor//jar",
"@javax-xml-bind//jar",
@@ -61,7 +63,6 @@
tags = ["events-aws-kinesis"],
deps = [
":events-aws-kinesis__plugin_test_deps",
- "//lib/testcontainers",
"@amazon-http-client-spi//jar",
"@amazon-kinesis-client//jar",
"@amazon-kinesis//jar",
@@ -76,10 +77,13 @@
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":events-aws-kinesis__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",
"@amazon-regions//jar",
"@amazon-auth//jar",
"@amazon-kinesis//jar",
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 6f6398b..2ed72d8 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -102,6 +102,18 @@
)
maven_jar(
+ name = "jackson-annotations",
+ artifact = "com.fasterxml.jackson.core:jackson-annotations:" + JACKSON_VER,
+ sha1 = "6ae6028aff033f194c9710ad87c224ccaadeed6c",
+ )
+
+ maven_jar(
+ name = "jackson-core",
+ artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VER,
+ sha1 = "8796585e716440d6dd5128b30359932a9eb74d0d",
+ )
+
+ maven_jar(
name = "jackson-dataformat-cbor",
artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:" + JACKSON_VER,
sha1 = "c854bb2d46138198cb5d4aae86ef6c04b8bc1e70",
@@ -162,9 +174,55 @@
)
maven_jar(
+ name = "commons-lang",
+ artifact = "commons-lang:commons-lang:2.6",
+ sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2",
+ )
+
+ TESTCONTAINERS_VERSION = "1.15.3"
+
+ maven_jar(
+ name = "testcontainers",
+ artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
+ sha1 = "95c6cfde71c2209f0c29cb14e432471e0b111880",
+ )
+
+ maven_jar(
name = "testcontainer-localstack",
- artifact = "org.testcontainers:localstack:1.15.2",
- sha1 = "ae3c4717bc5f37410abbb490cb46d349a77990a0",
+ artifact = "org.testcontainers:localstack:" + TESTCONTAINERS_VERSION,
+ sha1 = "7aa69995bdaafb4b06e69fdab9bd98c4fddee43d",
+ )
+
+ 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(
