Skip to content

Commit 7f38f42

Browse files
dependabot[bot]ebyhr
authored andcommitted
Bump org.testcontainers:testcontainers-bom from 1.21.0 to 2.0.3
Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.21.0 to 2.0.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.21.0...2.0.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-version: 2.0.3 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent fe8276f commit 7f38f42

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

gateway-ha/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,37 +405,37 @@
405405

406406
<dependency>
407407
<groupId>org.testcontainers</groupId>
408-
<artifactId>jdbc</artifactId>
408+
<artifactId>testcontainers</artifactId>
409409
<scope>test</scope>
410410
</dependency>
411411

412412
<dependency>
413413
<groupId>org.testcontainers</groupId>
414-
<artifactId>mysql</artifactId>
414+
<artifactId>testcontainers-jdbc</artifactId>
415415
<scope>test</scope>
416416
</dependency>
417417

418418
<dependency>
419419
<groupId>org.testcontainers</groupId>
420-
<artifactId>oracle-xe</artifactId>
420+
<artifactId>testcontainers-mysql</artifactId>
421421
<scope>test</scope>
422422
</dependency>
423423

424424
<dependency>
425425
<groupId>org.testcontainers</groupId>
426-
<artifactId>postgresql</artifactId>
426+
<artifactId>testcontainers-oracle-free</artifactId>
427427
<scope>test</scope>
428428
</dependency>
429429

430430
<dependency>
431431
<groupId>org.testcontainers</groupId>
432-
<artifactId>testcontainers</artifactId>
432+
<artifactId>testcontainers-postgresql</artifactId>
433433
<scope>test</scope>
434434
</dependency>
435435

436436
<dependency>
437437
<groupId>org.testcontainers</groupId>
438-
<artifactId>trino</artifactId>
438+
<artifactId>testcontainers-trino</artifactId>
439439
<scope>test</scope>
440440
</dependency>
441441
</dependencies>

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import okhttp3.mockwebserver.MockWebServer;
2929
import org.jdbi.v3.core.Handle;
3030
import org.jdbi.v3.core.Jdbi;
31-
import org.testcontainers.containers.OracleContainer;
3231
import org.testcontainers.containers.PostgreSQLContainer;
32+
import org.testcontainers.oracle.OracleContainer;
3333

3434
import java.io.BufferedWriter;
3535
import java.io.File;
@@ -50,7 +50,6 @@
5050
import static java.nio.charset.StandardCharsets.UTF_8;
5151
import static java.util.Objects.requireNonNull;
5252
import static org.assertj.core.api.Assertions.assertThat;
53-
import static org.junit.jupiter.api.Assumptions.assumeTrue;
5453

5554
public class HaGatewayTestUtils
5655
{
@@ -167,16 +166,7 @@ public static void setUpBackend(
167166

168167
public static OracleContainer getOracleContainer()
169168
{
170-
// gvenzl/oracle-xe:18.4.0-slim is x86 only, and tests using this image will most likely timeout if
171-
// run on other CPU architectures. This test should run in three circumstances:
172-
// * in CI, defined by the presence of GitHub environment variables
173-
// * if the CPU architecture is x86_64
174-
// * if they are explicitly enabled by setting TG_RUN_ORACLE_TESTS=true in the test environment
175-
// reference: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables
176-
assumeTrue("true".equals(System.getenv("GITHUB_ACTIONS"))
177-
|| "x86_64".equalsIgnoreCase(System.getProperty("os.arch"))
178-
|| "true".equals(System.getenv("TG_RUN_ORACLE_TESTS")));
179-
return new OracleContainer("gvenzl/oracle-xe:18.4.0-slim");
169+
return new OracleContainer("gvenzl/oracle-free:23.9-slim");
180170
}
181171

182172
private static void verifyTrinoStatus(int port, String name)

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>org.testcontainers</groupId>
7070
<artifactId>testcontainers-bom</artifactId>
71-
<version>1.21.0</version>
71+
<version>2.0.3</version>
7272
<type>pom</type>
7373
<scope>import</scope>
7474
</dependency>

0 commit comments

Comments
 (0)