Skip to content

Commit 6ccea2f

Browse files
dependabot[bot]wendigo
dependabot[bot]
authored and
wendigo
committed
Bump org.testcontainers:testcontainers-bom from 1.21.3 to 2.0.0
Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.21.3 to 2.0.0. - [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.3...2.0.0) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-version: 2.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent 5da5879 commit 6ccea2f

File tree

51 files changed

+145
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+145
-147
lines changed

‎client/trino-jdbc/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,19 +345,19 @@
345345

346346
<dependency>
347347
<groupId>org.testcontainers</groupId>
348-
<artifactId>oracle-free</artifactId>
348+
<artifactId>testcontainers</artifactId>
349349
<scope>test</scope>
350350
</dependency>
351351

352352
<dependency>
353353
<groupId>org.testcontainers</groupId>
354-
<artifactId>postgresql</artifactId>
354+
<artifactId>testcontainers-oracle-free</artifactId>
355355
<scope>test</scope>
356356
</dependency>
357357

358358
<dependency>
359359
<groupId>org.testcontainers</groupId>
360-
<artifactId>testcontainers</artifactId>
360+
<artifactId>testcontainers-postgresql</artifactId>
361361
<scope>test</scope>
362362
</dependency>
363363

‎client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.api.TestInstance;
2626
import org.junit.jupiter.api.parallel.Execution;
27-
import org.testcontainers.containers.PostgreSQLContainer;
2827
import org.testcontainers.oracle.OracleContainer;
28+
import org.testcontainers.postgresql.PostgreSQLContainer;
2929

3030
import java.io.Closeable;
3131
import java.sql.Connection;
@@ -618,15 +618,15 @@ public String toString()
618618
private static class PostgresqlReferenceDriver
619619
implements ReferenceDriver
620620
{
621-
private final PostgreSQLContainer<?> postgresqlContainer;
621+
private final PostgreSQLContainer postgresqlContainer;
622622
private Connection connection;
623623
private Statement statement;
624624
private Optional<Optional<String>> timezoneSet = Optional.empty();
625625

626626
PostgresqlReferenceDriver()
627627
{
628628
// Use the current latest PostgreSQL version as the reference
629-
postgresqlContainer = new PostgreSQLContainer<>("postgres:15");
629+
postgresqlContainer = new PostgreSQLContainer("postgres:15");
630630
postgresqlContainer.start();
631631
}
632632

‎core/trino-main/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,13 @@
546546

547547
<dependency>
548548
<groupId>org.testcontainers</groupId>
549-
<artifactId>postgresql</artifactId>
549+
<artifactId>testcontainers</artifactId>
550550
<scope>test</scope>
551551
</dependency>
552552

553553
<dependency>
554554
<groupId>org.testcontainers</groupId>
555-
<artifactId>testcontainers</artifactId>
555+
<artifactId>testcontainers-postgresql</artifactId>
556556
<scope>test</scope>
557557
</dependency>
558558
</dependencies>

‎core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
import org.testcontainers.containers.FixedHostPortGenericContainer;
4949
import org.testcontainers.containers.GenericContainer;
5050
import org.testcontainers.containers.Network;
51-
import org.testcontainers.containers.PostgreSQLContainer;
5251
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
5352
import org.testcontainers.containers.wait.strategy.Wait;
5453
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
54+
import org.testcontainers.postgresql.PostgreSQLContainer;
5555
import org.testcontainers.utility.MountableFile;
5656

5757
import java.io.IOException;
@@ -77,7 +77,7 @@ public class TestingHydraIdentityProvider
7777

7878
private final Network network = Network.newNetwork();
7979

80-
private final PostgreSQLContainer<?> databaseContainer = new PostgreSQLContainer<>()
80+
private final PostgreSQLContainer databaseContainer = new PostgreSQLContainer(PostgreSQLContainer.NAME)
8181
.withNetwork(network)
8282
.withNetworkAliases("database")
8383
.withUsername("hydra")

‎lib/trino-filesystem-alluxio/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@
119119

120120
<dependency>
121121
<groupId>org.testcontainers</groupId>
122-
<artifactId>junit-jupiter</artifactId>
122+
<artifactId>testcontainers</artifactId>
123123
<scope>test</scope>
124124
</dependency>
125125

126126
<dependency>
127127
<groupId>org.testcontainers</groupId>
128-
<artifactId>testcontainers</artifactId>
128+
<artifactId>testcontainers-junit-jupiter</artifactId>
129129
<scope>test</scope>
130130
</dependency>
131131
</dependencies>

‎lib/trino-filesystem-s3/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,25 +272,25 @@
272272

273273
<dependency>
274274
<groupId>org.testcontainers</groupId>
275-
<artifactId>junit-jupiter</artifactId>
275+
<artifactId>testcontainers</artifactId>
276276
<scope>test</scope>
277277
</dependency>
278278

279279
<dependency>
280280
<groupId>org.testcontainers</groupId>
281-
<artifactId>localstack</artifactId>
281+
<artifactId>testcontainers-junit-jupiter</artifactId>
282282
<scope>test</scope>
283283
</dependency>
284284

285285
<dependency>
286286
<groupId>org.testcontainers</groupId>
287-
<artifactId>testcontainers</artifactId>
287+
<artifactId>testcontainers-localstack</artifactId>
288288
<scope>test</scope>
289289
</dependency>
290290

291291
<dependency>
292292
<groupId>org.testcontainers</groupId>
293-
<artifactId>toxiproxy</artifactId>
293+
<artifactId>testcontainers-toxiproxy</artifactId>
294294
<scope>test</scope>
295295
</dependency>
296296
</dependencies>

‎lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3FileSystemLocalStack.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
import io.airlift.units.DataSize;
1717
import io.opentelemetry.api.OpenTelemetry;
1818
import org.junit.jupiter.api.Test;
19-
import org.testcontainers.containers.localstack.LocalStackContainer;
20-
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
2119
import org.testcontainers.junit.jupiter.Container;
2220
import org.testcontainers.junit.jupiter.Testcontainers;
21+
import org.testcontainers.localstack.LocalStackContainer;
2322
import org.testcontainers.utility.DockerImageName;
2423
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2524
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -36,7 +35,7 @@ public class TestS3FileSystemLocalStack
3635

3736
@Container
3837
private static final LocalStackContainer LOCALSTACK = new LocalStackContainer(DockerImageName.parse("localstack/localstack:4.0.3"))
39-
.withServices(Service.S3);
38+
.withServices("s3");
4039

4140
@Override
4241
protected void initEnvironment()
@@ -56,7 +55,7 @@ protected String bucket()
5655
protected S3Client createS3Client()
5756
{
5857
return S3Client.builder()
59-
.endpointOverride(LOCALSTACK.getEndpointOverride(Service.S3))
58+
.endpointOverride(LOCALSTACK.getEndpoint())
6059
.region(Region.of(LOCALSTACK.getRegion()))
6160
.credentialsProvider(StaticCredentialsProvider.create(
6261
AwsBasicCredentials.create(LOCALSTACK.getAccessKey(), LOCALSTACK.getSecretKey())))
@@ -69,7 +68,7 @@ protected S3FileSystemFactory createS3FileSystemFactory()
6968
return new S3FileSystemFactory(OpenTelemetry.noop(), new S3FileSystemConfig()
7069
.setAwsAccessKey(LOCALSTACK.getAccessKey())
7170
.setAwsSecretKey(LOCALSTACK.getSecretKey())
72-
.setEndpoint(LOCALSTACK.getEndpointOverride(Service.S3).toString())
71+
.setEndpoint(LOCALSTACK.getEndpoint().toString())
7372
.setRegion(LOCALSTACK.getRegion())
7473
.setStreamingPartSize(DataSize.valueOf("5.5MB")), new S3FileSystemStats());
7574
}

‎lib/trino-filesystem-s3/src/test/java/io/trino/filesystem/s3/TestS3Retries.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.api.TestInstance;
2626
import org.testcontainers.containers.Network;
27-
import org.testcontainers.containers.ToxiproxyContainer;
27+
import org.testcontainers.toxiproxy.ToxiproxyContainer;
2828
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2929
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
3030
import software.amazon.awssdk.core.exception.SdkClientException;

‎lib/trino-hdfs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,13 @@
254254

255255
<dependency>
256256
<groupId>org.testcontainers</groupId>
257-
<artifactId>junit-jupiter</artifactId>
257+
<artifactId>testcontainers</artifactId>
258258
<scope>test</scope>
259259
</dependency>
260260

261261
<dependency>
262262
<groupId>org.testcontainers</groupId>
263-
<artifactId>testcontainers</artifactId>
263+
<artifactId>testcontainers-junit-jupiter</artifactId>
264264
<scope>test</scope>
265265
</dependency>
266266
</dependencies>

‎plugin/trino-cassandra/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@
262262

263263
<dependency>
264264
<groupId>org.testcontainers</groupId>
265-
<artifactId>cassandra</artifactId>
265+
<artifactId>testcontainers</artifactId>
266266
<scope>test</scope>
267267
</dependency>
268268

269269
<dependency>
270270
<groupId>org.testcontainers</groupId>
271-
<artifactId>testcontainers</artifactId>
271+
<artifactId>testcontainers-cassandra</artifactId>
272272
<scope>test</scope>
273273
</dependency>
274274
</dependencies>

0 commit comments

Comments
 (0)