Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade testcontainers to 1.15.0 Upgrade bazlets to latest stable-2.16 to build with 2.16.23 API Change-Id: I8439caf3028b640f97ea4685dd2c6b1ccbdb06db
diff --git a/BUILD b/BUILD index 66c91cf..eafc5ca 100644 --- a/BUILD +++ b/BUILD
@@ -87,7 +87,10 @@ exports = EXECUTOR_DEPS + PLUGIN_DEPS + PLUGIN_TEST_DEPS + [ ":gc-conductor__plugin", ":gc-executor_lib", + "@docker-java-api//jar", + "@docker-java-transport//jar", "@duct_tape//jar", + "@jackson-annotations//jar", "@jna//jar", "@testcontainers-database-commons//jar", "@testcontainers-jdbc//jar",
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 077599a..a06d37b 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -7,18 +7,18 @@ sha1 = "92edc22a9ab2f3e17c9bf700aaee377d50e8b530", ) - SLF4J_VERS = "1.7.26" + SLF4J_VERS = "1.7.30" maven_jar( name = "slf4j-api", artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS, - sha1 = "77100a62c2e6f04b53977b9f541044d7d722693d", + sha1 = "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", ) maven_jar( name = "slf4j-ext", artifact = "org.slf4j:slf4j-ext:" + SLF4J_VERS, - sha1 = "31cdf122e000322e9efcb38913e9ab07825b17ef", + sha1 = "595d5dabfeb29244b8c91776898cee78299080d5", ) LOG4J2_VERS = "2.11.1" @@ -128,28 +128,50 @@ sha1 = "0e0845217c4907822403912ad6828d8e0b256208", ) - TESTCONTAINERS_VERS = "1.14.3" + DOCKER_JAVA_VERS = "3.2.5" + + maven_jar( + name = "docker-java-api", + artifact = "com.github.docker-java:docker-java-api:" + DOCKER_JAVA_VERS, + sha1 = "8fe5c5e39f940ce58620e77cedc0a2a52d76f9d8", + ) + + maven_jar( + name = "docker-java-transport", + artifact = "com.github.docker-java:docker-java-transport:" + DOCKER_JAVA_VERS, + sha1 = "27af0ee7ebc2f5672e23ea64769497b5d55ce3ac", + ) + + # https://github.com/docker-java/docker-java/blob/3.2.5/pom.xml#L61 + # <=> DOCKER_JAVA_VERS + maven_jar( + name = "jackson-annotations", + artifact = "com.fasterxml.jackson.core:jackson-annotations:2.10.3", + sha1 = "0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7", + ) + + TESTCONTAINERS_VERS = "1.15.0" maven_jar( name = "testcontainers", artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERS, - sha1 = "071fc82ba663f469447a19434e7db90f3a872753", + sha1 = "b627535b444d88e7b14953bb953d80d9b7b3bd76", ) maven_jar( name = "testcontainers-database-commons", artifact = "org.testcontainers:database-commons:" + TESTCONTAINERS_VERS, - sha1 = "fdc353bc113e74d94556bf73360a0716412a9ba6", + sha1 = "bc52637643da33f8fadfb6220cb59a7d8da37325", ) maven_jar( name = "testcontainers-jdbc", artifact = "org.testcontainers:jdbc:" + TESTCONTAINERS_VERS, - sha1 = "c0c1ae2978da65455414fa433afd6d15d777b4f8", + sha1 = "3626ed0746c94b337b1872afa90331bf9e2e6e16", ) maven_jar( name = "testcontainers-postgres", artifact = "org.testcontainers:postgresql:" + TESTCONTAINERS_VERS, - sha1 = "08844cf0cb612047a1b632e1b64b25fe58dc4083", + sha1 = "25daf6c0dd1d52e4a1b899c5b3e07b71d382c7ba", )