[FLINK-38809][Tests] Upgrade Testcontainers to 2.0.2

Author: MartijnVisser

flink-end-to-end-tests/flink-sql-client-test/pom.xml

@@ -73,7 +73,7 @@ under the License.
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>kafka</artifactId>
+			<artifactId>testcontainers-kafka</artifactId>
 			<scope>test</scope>
 		</dependency>
 

flink-end-to-end-tests/flink-sql-client-test/src/test/java/SqlClientITCase.java

@@ -42,11 +42,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.kafka.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
@@ -80,7 +80,9 @@ public class SqlClientITCase {
 
     @Container
     public static final KafkaContainer KAFKA =
-            new KafkaContainer(DockerImageName.parse(DockerImageVersions.KAFKA))
+            new KafkaContainer(
+                            DockerImageName.parse(DockerImageVersions.KAFKA)
+                                    .asCompatibleSubstituteFor("apache/kafka"))
                     .withNetwork(NETWORK)
                     .withNetworkAliases(INTER_CONTAINER_KAFKA_ALIAS)
                     .withLogConsumer(LOG_CONSUMER);

pom.xml

@@ -164,7 +164,7 @@ under the License.
 		<beam.version>2.54.0</beam.version>
 		<protoc.version>4.32.1</protoc.version>
 		<okhttp.version>3.14.9</okhttp.version>
-		<testcontainers.version>1.20.2</testcontainers.version>
+		<testcontainers.version>2.0.2</testcontainers.version>
 		<lz4.version>1.8.0</lz4.version>
 		<commons.io.version>2.15.1</commons.io.version>
 		<japicmp.skip>false</japicmp.skip>
@@ -293,7 +293,7 @@ under the License.
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
+			<artifactId>testcontainers-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -1804,6 +1804,10 @@ under the License.
 					<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
 					<reuseForks>${flink.reuseForks}</reuseForks>
 					<trimStackTrace>false</trimStackTrace>
+					<environmentVariables>
+						<!-- Force docker-java to use API version 1.41 for compatibility with CI environment -->
+						<DOCKER_API_VERSION>1.41</DOCKER_API_VERSION>
+					</environmentVariables>
 					<systemPropertyVariables combine.children="append">
 						<forkNumber>0${surefire.forkNumber}</forkNumber>
 						<!-- $$ ensures that surefire resolves this to the current forkNumber,