From 1af7731dfc871906a917043ffc3a6cbae83bc979 Mon Sep 17 00:00:00 2001
From: Chesnay Schepler <chesnay@apache.org>
Date: Fri, 10 Sep 2021 09:18:48 +0200
Subject: [PATCH] [FLINK-22971][tests] Bump testcontainers to 1.16.0

---
 flink-connectors/flink-connector-elasticsearch6/pom.xml   | 1 -
 flink-connectors/flink-connector-elasticsearch7/pom.xml   | 1 -
 flink-connectors/flink-connector-jdbc/pom.xml             | 2 --
 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-common/pom.xml                 | 1 -
 pom.xml                                                   | 8 ++++++++
 9 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/flink-connectors/flink-connector-elasticsearch6/pom.xml b/flink-connectors/flink-connector-elasticsearch6/pom.xml
index 85bf6796fa1b2..14fc93cc9953f 100644
--- a/flink-connectors/flink-connector-elasticsearch6/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch6/pom.xml
@@ -86,7 +86,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 f12f68fb5bbb0..67a1066e55c5c 100644
--- a/flink-connectors/flink-connector-elasticsearch7/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch7/pom.xml
@@ -86,7 +86,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 06bfbf25224d5..c0895ef03eaff 100644
--- a/flink-connectors/flink-connector-jdbc/pom.xml
+++ b/flink-connectors/flink-connector-jdbc/pom.xml
@@ -168,14 +168,12 @@ under the License.
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>1.15.1</version>
 			<scope>test</scope>
         </dependency>
 
         <dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>mysql</artifactId>
-			<version>1.15.3</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml
index 4bebaf86cf2a8..0e776de0f53cd 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -124,7 +124,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 ee66cd4a23046..9e359d224ca16 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -173,7 +173,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 2f778e8fde808..af0153d8810e0 100644
--- a/flink-connectors/flink-connector-rabbitmq/pom.xml
+++ b/flink-connectors/flink-connector-rabbitmq/pom.xml
@@ -80,7 +80,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 692d337e5b5ab..4c88445a8bcb2 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 b219ae1e288c3..fc6faec8e2215 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
@@ -65,7 +65,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 391527334a309..499d28359630e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@ under the License.
 		<beam.version>2.27.0</beam.version>
 		<protoc.version>3.11.1</protoc.version>
 		<arrow.version>0.16.0</arrow.version>
+		<testcontainers.version>1.16.0</testcontainers.version>
 		<japicmp.skip>false</japicmp.skip>
 		<flink.convergence.phase>validate</flink.convergence.phase>
 		<!--
@@ -821,6 +822,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>