Testcontainers upgrade

.github/workflows/build.yaml

@@ -31,9 +31,6 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Override docker client version # https://github.com/testcontainers/testcontainers-java/issues/11212
-        run: echo "api.version=1.44" > ~/.docker-java.properties
-
       - name: Build with Maven
         run: mvn $MAVEN_ARGS verify
 
@@ -56,9 +53,6 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Override docker client version # https://github.com/testcontainers/testcontainers-java/issues/11212
-        run: echo "api.version=1.44" > ~/.docker-java.properties
-
       - name: Build with Maven
         run: mvn $MAVEN_ARGS test
 

.github/workflows/ci.yaml

@@ -110,9 +110,6 @@ jobs:
               yc/pom.xml
               jdbc/pom.xml
 
-      - name: Override docker client version # https://github.com/testcontainers/testcontainers-java/issues/11212
-        run: echo "api.version=1.44" > ~/.docker-java.properties
-
       - name: Extract YDB Java SDK version
         working-directory: ./sdk
         run: |

.github/workflows/publish.yaml

@@ -48,9 +48,6 @@ jobs:
         with:
           script: core.setFailed('Release name must be equal to project version')
 
-      - name: Override docker client version # https://github.com/testcontainers/testcontainers-java/issues/11212
-        run: echo "api.version=1.44" > ~/.docker-java.properties
-
       - name: Download dependencies
         run: mvn $MAVEN_ARGS dependency:go-offline
 

coordination/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>ydb-sdk-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-junit4-support</artifactId>

pom.xml

@@ -40,7 +40,8 @@
         <log4j2.version>2.25.3</log4j2.version>
         <gson.version>2.13.2</gson.version>
         <mockito.version>5.21.0</mockito.version>
-        <testcontainers.version>1.19.3</testcontainers.version>
+
+        <testcontainers.version>2.0.3</testcontainers.version>
     </properties>
 
     <licenses>

query/pom.xml

@@ -25,11 +25,18 @@
             <artifactId>ydb-sdk-table</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-junit4-support</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>

table/pom.xml

@@ -29,6 +29,12 @@
             <artifactId>ydb-sdk-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-junit4-support</artifactId>

tests/common/pom.xml

@@ -32,11 +32,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <!--
-            We cannot use testcontainers without junit4
-            See https://github.com/testcontainers/testcontainers-java/issues/87
-            -->
-            <!--<scope>test</scope>-->
+            <scope>test</scope>
         </dependency>
 
         <dependency>

tests/common/src/main/java/tech/ydb/test/integration/docker/YdbDockerContainer.java

@@ -4,9 +4,9 @@
 import java.util.Collections;
 import java.util.UUID;
 
+import org.apache.commons.io.IOUtils;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 import org.testcontainers.utility.ResourceReaper;
 
 import tech.ydb.core.impl.pool.EndpointRecord;

tests/common/src/test/java/tech/ydb/test/integration/DockerMock.java

@@ -59,6 +59,7 @@ public void setup(Boolean enabled, Boolean reuseSupport) {
         Mockito.doNothing().when(resourceReaper).registerLabelsFilterForCleanup(Mockito.anyMap());
 
         Mockito.when(configration.environmentSupportsReuse()).thenReturn(reuseSupport);
+        Mockito.when(configration.getImagePullTimeout()).thenReturn(120);
     }
 
     @Override

tests/junit4-support/pom.xml

@@ -19,6 +19,13 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!-- Testcontainers depends jackson 2.15+ and it dependency overrides dependency from yc-auth-provider -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.4</version>
+        </dependency>
+
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-tests-common</artifactId>

tests/junit5-support/pom.xml

@@ -19,6 +19,13 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!-- Testcontainers depends jackson 2.15+ and it dependency overrides dependency from yc-auth-provider -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.4</version>
+        </dependency>
+
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-tests-common</artifactId>