Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ updates:
ignore:
- dependency-name: "org.apache.pulsar:pulsar-bom"
update-types: ["version-update:semver-patch"]
# Pulsar 5 requires Java 17; the module is still built and tested against Java 8.
- dependency-name: "org.apache.pulsar:*"
update-types: ["version-update:semver-major"]

- package-ecosystem: "gradle"
directory: "/modules/r2dbc"
Expand Down
2 changes: 2 additions & 0 deletions modules/clickhouse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ dependencies {
api project(':testcontainers-jdbc')

compileOnly project(':testcontainers-r2dbc')
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.8', classifier: 'http')

testImplementation project(':testcontainers-jdbc-test')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
class LegacyModeTest {

private static final DockerImageName LOCALSTACK_CUSTOM_TAG = DockerImageName
.parse("localstack/localstack:0.12.8")
.parse("localstack/localstack:0.11.3")
.withTag("custom");

@BeforeAll
static void setup() {
DockerClient dockerClient = DockerClientFactory.instance().client();
dockerClient
.tagImageCmd(
new RemoteDockerImage(LocalstackTestImages.LOCALSTACK_0_12_IMAGE).get(),
new RemoteDockerImage(LocalstackTestImages.LOCALSTACK_0_11_IMAGE).get(),
LOCALSTACK_CUSTOM_TAG.getRepository(),
LOCALSTACK_CUSTOM_TAG.getVersionPart()
)
Expand All @@ -34,7 +34,6 @@ static void setup() {

static Stream<Arguments> localstackVersionWithLegacyOff() {
return Stream.of(
Arguments.arguments("0.12", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_12_IMAGE)),
Arguments.arguments("0.11", new LocalStackContainer(LocalstackTestImages.LOCALSTACK_0_11_IMAGE)),
Arguments.arguments(
"0.11 with legacy = off",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ public interface LocalstackTestImages {

DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");

DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");

DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
}
2 changes: 2 additions & 0 deletions modules/mariadb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies {
api project(':testcontainers-jdbc')

compileOnly project(':testcontainers-r2dbc')
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

testImplementation project(':testcontainers-jdbc-test')
Expand Down
2 changes: 2 additions & 0 deletions modules/mssqlserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies {
api project(':testcontainers-jdbc')

compileOnly project(':testcontainers-r2dbc')
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'io.r2dbc:r2dbc-mssql:1.0.5.RELEASE'

testImplementation project(':testcontainers-jdbc-test')
Expand Down
2 changes: 2 additions & 0 deletions modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies {
api project(':testcontainers-jdbc')

compileOnly project(':testcontainers-r2dbc')
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'

testImplementation project(':testcontainers-jdbc-test')
Expand Down
2 changes: 2 additions & 0 deletions modules/postgresql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies {
api project(':testcontainers-jdbc')

compileOnly project(':testcontainers-r2dbc')
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

testImplementation project(':testcontainers-jdbc-test')
Expand Down
2 changes: 2 additions & 0 deletions modules/r2dbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ description = "Testcontainers :: R2DBC"
dependencies {
api project(':testcontainers')
api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
// javax.annotation.Nullable; no longer leaked transitively by Guava >= 33.4
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'

testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
testImplementation project(':testcontainers-postgresql')
Expand Down
Loading