This is an automated email from the ASF dual-hosted git repository. arvid pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4fd33234407e07d99647e495819e009467828161 Author: Qingsheng Ren <[email protected]> AuthorDate: Mon Aug 9 11:51:52 2021 +0800 [hotfix][test/testcontainers] Use Testcontainer BOM to manage versions in the project --- flink-connectors/flink-connector-elasticsearch6/pom.xml | 1 - flink-connectors/flink-connector-elasticsearch7/pom.xml | 1 - flink-connectors/flink-connector-jdbc/pom.xml | 7 +++++-- flink-connectors/flink-connector-kafka/pom.xml | 1 - flink-connectors/flink-connector-kinesis/pom.xml | 1 - flink-connectors/flink-connector-rabbitmq/pom.xml | 1 - .../flink-end-to-end-tests-common-kafka/pom.xml | 1 - flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml | 1 - pom.xml | 8 ++++++++ 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/flink-connectors/flink-connector-elasticsearch6/pom.xml b/flink-connectors/flink-connector-elasticsearch6/pom.xml index 6491887..e62bd26 100644 --- a/flink-connectors/flink-connector-elasticsearch6/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch6/pom.xml @@ -91,7 +91,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>elasticsearch</artifactId> - <version>1.15.1</version> <scope>test</scope> </dependency> diff --git a/flink-connectors/flink-connector-elasticsearch7/pom.xml b/flink-connectors/flink-connector-elasticsearch7/pom.xml index 0141d69..392c9a8 100644 --- a/flink-connectors/flink-connector-elasticsearch7/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch7/pom.xml @@ -89,7 +89,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>elasticsearch</artifactId> - <version>1.15.1</version> <scope>test</scope> </dependency> diff --git a/flink-connectors/flink-connector-jdbc/pom.xml b/flink-connectors/flink-connector-jdbc/pom.xml index 0110505..f7ad719 100644 --- a/flink-connectors/flink-connector-jdbc/pom.xml +++ b/flink-connectors/flink-connector-jdbc/pom.xml @@ -123,6 +123,11 @@ under the License. <version>${otj-pg-embedded.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>postgresql</artifactId> + <scope>test</scope> + </dependency> <!-- MySQL tests --> <dependency> @@ -166,14 +171,12 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>postgresql</artifactId> - <version>1.15.3</version> <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>mysql</artifactId> - <version>1.15.3</version> <scope>test</scope> </dependency> </dependencies> diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml index 9a1fdef..2301a06 100644 --- a/flink-connectors/flink-connector-kafka/pom.xml +++ b/flink-connectors/flink-connector-kafka/pom.xml @@ -121,7 +121,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>kafka</artifactId> - <version>1.15.1</version> <scope>test</scope> </dependency> diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml index 8068b3f..fba1727 100644 --- a/flink-connectors/flink-connector-kinesis/pom.xml +++ b/flink-connectors/flink-connector-kinesis/pom.xml @@ -195,7 +195,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.15.3</version> <scope>test</scope> </dependency> diff --git a/flink-connectors/flink-connector-rabbitmq/pom.xml b/flink-connectors/flink-connector-rabbitmq/pom.xml index 12b6cd2..f1904eb 100644 --- a/flink-connectors/flink-connector-rabbitmq/pom.xml +++ b/flink-connectors/flink-connector-rabbitmq/pom.xml @@ -87,7 +87,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>rabbitmq</artifactId> - <version>1.15.3</version> <scope>test</scope> </dependency> diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml index ba5d81f..8c3b90d 100644 --- a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml +++ b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml @@ -104,7 +104,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>kafka</artifactId> - <version>1.15.1</version> </dependency> <dependency> diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml index aa8b301..702fe8d 100644 --- a/flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml +++ b/flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml @@ -63,7 +63,6 @@ under the License. <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.15.1</version> </dependency> <dependency> <!-- To ensure that flink-dist is built beforehand --> diff --git a/pom.xml b/pom.xml index e162904..9eace84 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,7 @@ under the License. <protoc.version>3.17.3</protoc.version> <arrow.version>0.16.0</arrow.version> <okhttp.version>3.14.9</okhttp.version> + <testcontainers.version>1.15.3</testcontainers.version> <lz4.version>1.8.0</lz4.version> <japicmp.skip>false</japicmp.skip> <flink.convergence.phase>validate</flink.convergence.phase> @@ -787,6 +788,13 @@ under the License. <artifactId>snakeyaml</artifactId> <version>1.27</version> </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-bom</artifactId> + <version>${testcontainers.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement>
