Bump org.testcontainers:testcontainers-bom from 1.21.0 to 2.0.3

gateway-ha/pom.xml

@@ -405,37 +405,37 @@
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>jdbc</artifactId>
+            <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <artifactId>testcontainers-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>oracle-xe</artifactId>
+            <artifactId>testcontainers-mysql</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-oracle-free</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>trino</artifactId>
+            <artifactId>testcontainers-trino</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java

@@ -28,8 +28,8 @@
 import okhttp3.mockwebserver.MockWebServer;
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
-import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.oracle.OracleContainer;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -50,7 +50,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class HaGatewayTestUtils
 {
@@ -167,16 +166,7 @@ public static void setUpBackend(
 
     public static OracleContainer getOracleContainer()
     {
-        // gvenzl/oracle-xe:18.4.0-slim is x86 only, and tests using this image will most likely timeout if
-        // run on other CPU architectures. This test should run in three circumstances:
-        // * in CI, defined by the presence of GitHub environment variables
-        // * if the CPU architecture is x86_64
-        // * if they are explicitly enabled by setting TG_RUN_ORACLE_TESTS=true in the test environment
-        // reference: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables
-        assumeTrue("true".equals(System.getenv("GITHUB_ACTIONS"))
-                || "x86_64".equalsIgnoreCase(System.getProperty("os.arch"))
-                || "true".equals(System.getenv("TG_RUN_ORACLE_TESTS")));
-        return new OracleContainer("gvenzl/oracle-xe:18.4.0-slim");
+        return new OracleContainer("gvenzl/oracle-free:23.9-slim");
     }
 
     private static void verifyTrinoStatus(int port, String name)

pom.xml

@@ -68,7 +68,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
-                <version>1.21.0</version>
+                <version>2.0.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>