Upgrade Testcontainers to 2.0.3 #144

Author: andrus

RELEASE-NOTES.md

@@ -1,3 +1,7 @@
+## 4.0-M3
+
+* #144 Upgrade Testcontainers to 2.0.3
+
 ## 4.0-M1
 
 * #137 Remove deprecated modules and APIs

bootique-jdbc-junit5-testcontainers/pom.xml

@@ -50,20 +50,12 @@
             <artifactId>bootique-jdbc-junit5</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
+            <groupId>io.bootique</groupId>
+            <artifactId>bootique-testcontainers-internal</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers-jdbc</artifactId>
         </dependency>
 
         <!-- Unit test dependencies -->

pom.xml

@@ -42,7 +42,6 @@
         <postgresql.version>42.7.7</postgresql.version>
         <mysql.version>9.2.0</mysql.version>
         <liquibase.version>4.30.0</liquibase.version>
-        <commons.compress.version>1.26.1</commons.compress.version>
         <commons.io.version>2.19.0</commons.io.version>
         <commons.lang.version>3.18.0</commons.lang.version>
         <commons.text.version>1.14.0</commons.text.version>
@@ -90,6 +89,11 @@
                 <artifactId>bootique-junit5</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.bootique</groupId>
+                <artifactId>bootique-testcontainers-internal</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>
@@ -153,37 +157,47 @@
                 <artifactId>derbytools</artifactId>
                 <version>${derby.version}</version>
             </dependency>
-            <!-- Importing testcontainers modules individually instead of using a BOM
-            to have more control over the transitive dependencies -->
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-jdbc</artifactId>
                 <version>${testcontainers.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-compress</artifactId>
+                        <groupId>org.testcontainers</groupId>
+                        <artifactId>testcontainers</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-postgresql</artifactId>
                 <version>${testcontainers.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.testcontainers</groupId>
+                        <artifactId>testcontainers</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-mysql</artifactId>
                 <version>${testcontainers.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.testcontainers</groupId>
+                        <artifactId>testcontainers</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-junit-jupiter</artifactId>
                 <version>${testcontainers.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter-api</artifactId>
+                        <groupId>org.testcontainers</groupId>
+                        <artifactId>testcontainers</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -202,21 +216,6 @@
                 <artifactId>commons-csv</artifactId>
                 <version>1.11.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>${commons.compress.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-lang3</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>