From 16f670241e6b06f1d519b38689da01290147500d Mon Sep 17 00:00:00 2001
From: Martijn Visser <mvisser@confluent.io>
Date: Mon, 17 Jul 2023 11:09:43 +0200
Subject: [PATCH] Revert "[FLINK-28347][Test infrastructure] Upgrade
 testcontainers to 1.18.3 (#71)"

This reverts commit 7798196cc460622211751f0ca9ed9ea8046b8622.
---
 flink-connector-elasticsearch-e2e-tests/pom.xml | 13 -------------
 pom.xml                                         | 10 +---------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/flink-connector-elasticsearch-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/pom.xml
index caf292fd..1114edc4 100644
--- a/flink-connector-elasticsearch-e2e-tests/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/pom.xml
@@ -39,19 +39,6 @@ under the License.
 		<module>flink-connector-elasticsearch7-e2e-tests</module>
     </modules>
 
-	<dependencyManagement>
-		<dependencies>
-			<!-- We pick the version of net.java.dev.jna:jna to satisfy dependency
-				 convergence for org.testcontainers:testcontainers which transitively depends on
-				 two different versions.-->
-			<dependency>
-				<groupId>net.java.dev.jna</groupId>
-				<artifactId>jna</artifactId>
-				<version>5.12.1</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<profiles>
 		<profile>
 			<id>run-end-to-end-tests</id>
diff --git a/pom.xml b/pom.xml
index d3227189..57bb1e95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,7 @@ under the License.
 		<junit4.version>4.13.2</junit4.version>
 		<junit5.version>5.9.1</junit5.version>
 		<assertj.version>3.23.1</assertj.version>
-		<!-- keep net.java.dev.jna:jna in sync with the one from testcontainers -->
-		<testcontainers.version>1.18.3</testcontainers.version>
+		<testcontainers.version>1.17.2</testcontainers.version>
 		<mockito.version>3.4.6</mockito.version>
 
 		<japicmp.skip>false</japicmp.skip>
@@ -317,13 +316,6 @@ under the License.
 			</dependency>
 
 			<!-- For dependency convergence  -->
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-compress</artifactId>
-				<version>1.22</version>
-			</dependency>
-
-			<!-- For dependency convergence -->
 			<dependency>
 				<groupId>org.objenesis</groupId>
 				<artifactId>objenesis</artifactId>