chore(ci): bump testcontainers

- Bump org.testcontainers from 1.21.3 to 2.0.1
- Bump ch.qos.logback:logback-classic from 1.3.15 to 1.3.16

Author: dkasimovskiy

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Bump org.testcontainers from 1.21.3 to 2.0.1
+- Bump logback-classic from 1.3.15 to 1.3.16
 - Change `TARANTOOL_VERSION` default value from `2.11.2-ubuntu20.04` to `2.11.8-ubuntu20.04`
 - CI/CD: Change JDK distribution from Zulu to Temurin
 

pom.xml

@@ -53,7 +53,7 @@
     </scm>
 
     <properties>
-        <testcontainers.version>1.21.3</testcontainers.version>
+        <testcontainers.version>2.0.1</testcontainers.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.3.15</version>
+            <version>1.3.16</version>
             <scope>test</scope>
         </dependency>
 
@@ -114,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>

src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

@@ -10,10 +10,11 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.exceptions.CartridgeTopologyException;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
 import static org.testcontainers.containers.PathUtils.normalizePath;
 
 /**

src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vladimir Rogach

src/test/java/org/testcontainers/containers/PathUtilsTest.java

@@ -1,8 +1,8 @@
 package org.testcontainers.containers;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.testcontainers.containers.PathUtils.normalizePath;
 
 /**

src/test/java/org/testcontainers/containers/StaticTarantoolContainerIT.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Alexey Kuzin

src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java

@@ -13,7 +13,7 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlIT.java

@@ -8,7 +8,7 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Alexey Kuzin