From ed693e56817310d4bd8184385e44c01d61359d04 Mon Sep 17 00:00:00 2001 From: masahitojp Date: Tue, 1 Feb 2022 00:55:00 +0900 Subject: [PATCH] [BEAM-9195] Bump org.testcontainers to 1.16.3 --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- sdks/java/io/debezium/build.gradle | 6 +++--- .../elasticsearch-tests/elasticsearch-tests-5/build.gradle | 2 +- .../elasticsearch-tests/elasticsearch-tests-6/build.gradle | 2 +- .../elasticsearch-tests/elasticsearch-tests-7/build.gradle | 2 +- .../elasticsearch-tests-common/build.gradle | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 51b38f5b9b57..e88f104ce5c8 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -498,7 +498,7 @@ class BeamModulePlugin implements Plugin { def spark2_version = "2.4.8" def spark3_version = "3.1.2" def spotbugs_version = "4.0.6" - def testcontainers_version = "1.15.1" + def testcontainers_version = "1.16.3" def arrow_version = "5.0.0" def jmh_version = "1.34" diff --git a/sdks/java/io/debezium/build.gradle b/sdks/java/io/debezium/build.gradle index 2127269a53de..32e7d76c8616 100644 --- a/sdks/java/io/debezium/build.gradle +++ b/sdks/java/io/debezium/build.gradle @@ -46,9 +46,9 @@ dependencies { testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") testImplementation project(":runners:google-cloud-dataflow-java") - testImplementation "org.testcontainers:testcontainers:1.15.1" - testImplementation "org.testcontainers:mysql:1.15.1" - testImplementation "org.testcontainers:postgresql:1.15.1" + testImplementation library.java.testcontainers_base + testImplementation library.java.testcontainers_mysql + testImplementation library.java.testcontainers_postgresql // Kafka connect dependencies implementation "org.apache.kafka:connect-api:2.5.0" diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle index 88d110b31294..5eaa0d5b9738 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle @@ -49,7 +49,7 @@ dependencies { testImplementation "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.5.0" testImplementation "org.elasticsearch:elasticsearch:$elastic_search_version" - testImplementation "org.testcontainers:elasticsearch:1.15.3" + testImplementation library.java.testcontainers_elasticsearch testImplementation project(path: ":sdks:java:core", configuration: "shadow") testImplementation project(":sdks:java:io:elasticsearch") diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle index be150e186e53..fe251536ba60 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle @@ -49,7 +49,7 @@ dependencies { testImplementation "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.5.2" testImplementation "org.elasticsearch:elasticsearch:$elastic_search_version" - testImplementation "org.testcontainers:elasticsearch:1.15.3" + testImplementation library.java.testcontainers_elasticsearch testImplementation project(path: ":sdks:java:core", configuration: "shadow") testImplementation project(path: ":sdks:java:io:common", configuration: "testRuntimeMigration") diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle index 502a8f50ce43..825315a69900 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation "org.elasticsearch.test:framework:$elastic_search_version" testImplementation "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.5" - testImplementation "org.testcontainers:elasticsearch:1.15.3" + testImplementation library.java.testcontainers_elasticsearch testImplementation project(path: ":sdks:java:core", configuration: "shadow") testImplementation project(":sdks:java:io:elasticsearch") diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle index 7cdae07551a7..ba899173811a 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle @@ -47,7 +47,7 @@ dependencies { testImplementation library.java.junit testImplementation "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version" testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${elastic_search_version}" - testImplementation "org.testcontainers:elasticsearch:1.15.3" + testImplementation library.java.testcontainers_elasticsearch testRuntimeOnly "org.apache.logging.log4j:log4j-api:$log4j_version" testRuntimeOnly "org.apache.logging.log4j:log4j-core:$log4j_version"