Separate platform and connector testcontainer versions (#13642)

* Separate platform and connector testcontainer versions

* Fix dependency

* Fix dependency

* Fix dependency usage

* Prevent leaking testcontainer dependencies

airbyte-bootloader/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     implementation 'io.temporal:temporal-sdk:1.8.1'
     implementation libs.flyway.core
 
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.platform.testcontainers.postgresql
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:1.2.0'
 }
 

airbyte-config/config-persistence/build.gradle

@@ -16,7 +16,7 @@ dependencies {
     implementation 'com.google.cloud:google-cloud-secretmanager:2.0.5'
 
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.platform.testcontainers.postgresql
     testImplementation libs.flyway.core
     testImplementation project(':airbyte-test-utils')
     integrationTestJavaImplementation project(':airbyte-config:config-persistence')

airbyte-container-orchestrator/build.gradle

@@ -21,8 +21,8 @@ dependencies {
 
     testImplementation 'org.mockito:mockito-inline:2.13.0'
     testImplementation libs.postgresql
-    testImplementation libs.testcontainers
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.platform.testcontainers
+    testImplementation libs.platform.testcontainers.postgresql
 
     testImplementation project(':airbyte-commons-docker')
 }

airbyte-db/db-lib/build.gradle

@@ -12,7 +12,10 @@ dependencies {
     implementation project(':airbyte-json-validation')
     implementation project(':airbyte-config:config-models')
     implementation libs.flyway.core
-    implementation libs.testcontainers.postgresql
+
+    // Mark as compile only to avoid leaking transitively to connectors
+    compileOnly libs.platform.testcontainers.postgresql
+
     // These are required because gradle might be using lower version of Jna from other
     // library transitive dependency. Can be removed if we can figure out which library is the cause.
     // Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
@@ -21,6 +24,7 @@ dependencies {
 
     testImplementation project(':airbyte-test-utils')
     testImplementation 'org.apache.commons:commons-lang3:3.11'
+    testImplementation libs.platform.testcontainers.postgresql
 
     // Big Query
     implementation('com.google.cloud:google-cloud-bigquery:1.133.1')

airbyte-db/jooq/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 
     // jOOQ code generation
     implementation libs.jooq.codegen
-    implementation libs.testcontainers.postgresql
+    implementation libs.platform.testcontainers.postgresql
     // These are required because gradle might be using lower version of Jna from other
     // library transitive dependency. Can be removed if we can figure out which library is the cause.
     // Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
@@ -21,6 +21,7 @@ dependencies {
 
     // The jOOQ code generator only has access to classes added to the jooqGenerator configuration
     jooqGenerator project(':airbyte-db:db-lib')
+    jooqGenerator libs.platform.testcontainers.postgresql
 }
 
 jooq {

airbyte-integrations/bases/base-java/build.gradle

@@ -18,8 +18,8 @@ dependencies {
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.66'
     implementation 'org.bouncycastle:bctls-jdk15on:1.66'
 
-    implementation libs.testcontainers
-    implementation libs.testcontainers.jdbc
+    implementation libs.connectors.testcontainers
+    implementation libs.connectors.testcontainers.jdbc
 
     implementation files(project(':airbyte-integrations:bases:base').airbyteDocker.outputs)
 

airbyte-integrations/connectors/destination-cassandra/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.assertj/assertj-core
     testImplementation "org.assertj:assertj-core:${assertVersion}"
-    testImplementation libs.testcontainers.cassandra
+    testImplementation libs.connectors.testcontainers.cassandra
 
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/build.gradle

@@ -21,10 +21,10 @@ dependencies {
     implementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1-patch'
 
     // https://mvnrepository.com/artifact/org.testcontainers/clickhouse
-    testImplementation libs.testcontainers.clickhouse
+    testImplementation libs.connectors.destination.testcontainers.clickhouse
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-clickhouse')
     // https://mvnrepository.com/artifact/org.testcontainers/clickhouse
-    integrationTestJavaImplementation libs.testcontainers.clickhouse
+    integrationTestJavaImplementation libs.connectors.destination.testcontainers.clickhouse
 }

airbyte-integrations/connectors/destination-clickhouse/build.gradle

@@ -21,11 +21,11 @@ dependencies {
     implementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1-patch'
 
     // https://mvnrepository.com/artifact/org.testcontainers/clickhouse
-    testImplementation libs.testcontainers.clickhouse
+    testImplementation libs.connectors.destination.testcontainers.clickhouse
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-clickhouse')
     integrationTestJavaImplementation project(':airbyte-workers')
     // https://mvnrepository.com/artifact/org.testcontainers/clickhouse
-    integrationTestJavaImplementation libs.testcontainers.clickhouse
+    integrationTestJavaImplementation libs.connectors.destination.testcontainers.clickhouse
 }

airbyte-integrations/connectors/destination-elasticsearch/build.gradle

@@ -29,9 +29,8 @@ dependencies {
 
     // MIT
     // https://www.testcontainers.org/
-    //implementation libs.testcontainers.elasticsearch
-    testImplementation libs.testcontainers.elasticsearch
-    integrationTestJavaImplementation libs.testcontainers.elasticsearch
+    testImplementation libs.connectors.testcontainers.elasticsearch
+    integrationTestJavaImplementation libs.connectors.testcontainers.elasticsearch
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-elasticsearch')

airbyte-integrations/connectors/destination-jdbc/build.gradle

@@ -23,11 +23,11 @@ dependencies {
 //     https://github.com/aesy/datasize
     implementation "io.aesy:datasize:1.0.0"
 
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.connectors.testcontainers.postgresql
     testImplementation "org.mockito:mockito-inline:4.1.0"
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
-    integrationTestJavaImplementation libs.testcontainers.postgresql
+    integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-kafka/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-kafka')
-    integrationTestJavaImplementation libs.testcontainers.kafka
+    integrationTestJavaImplementation libs.connectors.testcontainers.kafka
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 }

airbyte-integrations/connectors/destination-mariadb-columnstore/build.gradle

@@ -22,5 +22,5 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mariadb-columnstore')
-    integrationTestJavaImplementation libs.testcontainers.mariadb
+    integrationTestJavaImplementation libs.connectors.testcontainers.mariadb
 }

airbyte-integrations/connectors/destination-meilisearch/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-meilisearch')
 
-    integrationTestJavaImplementation libs.testcontainers
+    integrationTestJavaImplementation libs.connectors.testcontainers
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 }

airbyte-integrations/connectors/destination-mongodb-strict-encrypt/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     implementation project(':airbyte-integrations:connectors:destination-mongodb')
     implementation 'org.mongodb:mongodb-driver-sync:4.3.0'
 
-    testImplementation libs.testcontainers.mongodb
+    testImplementation libs.connectors.testcontainers.mongodb
 
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mongodb-strict-encrypt')
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

airbyte-integrations/connectors/destination-mongodb/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 
     implementation 'org.mongodb:mongodb-driver-sync:4.3.0'
 
-    testImplementation libs.testcontainers.mongodb
+    testImplementation libs.connectors.testcontainers.mongodb
 
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mongodb')
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

airbyte-integrations/connectors/destination-mssql-strict-encrypt/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'
 
     testImplementation 'org.apache.commons:commons-lang3:3.11'
-    testImplementation libs.testcontainers.mssqlserver
+    testImplementation libs.connectors.testcontainers.mssqlserver
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mssql-strict-encrypt')

airbyte-integrations/connectors/destination-mssql/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'
 
     testImplementation 'org.apache.commons:commons-lang3:3.11'
-    testImplementation libs.testcontainers.mssqlserver
+    testImplementation libs.connectors.testcontainers.mssqlserver
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mssql')

airbyte-integrations/connectors/destination-mysql-strict-encrypt/build.gradle

@@ -20,7 +20,7 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
-    integrationTestJavaImplementation libs.testcontainers.mysql
+    integrationTestJavaImplementation libs.connectors.testcontainers.mysql
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-mysql/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
-    integrationTestJavaImplementation 'org.testcontainers:mysql:1.15.3'
+    integrationTestJavaImplementation libs.connectors.testcontainers.mysql
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-oracle-strict-encrypt/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     testImplementation project(':airbyte-test-utils')
 
     testImplementation 'org.apache.commons:commons-lang3:3.11'
-    testImplementation libs.testcontainers.oracle.xe
+    testImplementation libs.connectors.destination.testcontainers.oracle.xe
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')

airbyte-integrations/connectors/destination-oracle/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"
 
     testImplementation 'org.apache.commons:commons-lang3:3.11'
-    testImplementation 'org.testcontainers:oracle-xe:1.16.0'
+    testImplementation libs.connectors.destination.testcontainers.oracle.xe
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')

airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
 
-    integrationTestJavaImplementation libs.testcontainers.postgresql
+    integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-postgres/build.gradle

@@ -17,12 +17,12 @@ dependencies {
 
     testImplementation project(':airbyte-test-utils')
 
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.connectors.testcontainers.postgresql
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-postgres')
 
-    integrationTestJavaImplementation libs.testcontainers.postgresql
+    integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-pulsar/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 
     implementation 'org.apache.pulsar:pulsar-client:2.8.1'
 
-    testImplementation libs.testcontainers.pulsar
+    testImplementation libs.connectors.testcontainers.pulsar
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-pulsar')

airbyte-integrations/connectors/destination-redis/build.gradle

@@ -28,7 +28,7 @@ dependencies {
     // https://mvnrepository.com/artifact/org.assertj/assertj-core
     testImplementation "org.assertj:assertj-core:${assertVersion}"
     // https://mvnrepository.com/artifact/org.testcontainers/testcontainers
-    testImplementation libs.testcontainers
+    testImplementation libs.connectors.testcontainers
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-redis')

airbyte-integrations/connectors/destination-scylla/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     // https://mvnrepository.com/artifact/org.assertj/assertj-core
     testImplementation "org.assertj:assertj-core:${assertVersion}"
     // https://mvnrepository.com/artifact/org.testcontainers/testcontainers
-    testImplementation libs.testcontainers
+    testImplementation libs.connectors.testcontainers.scylla
 
 
 

airbyte-integrations/connectors/source-clickhouse-strict-encrypt/build.gradle

@@ -24,5 +24,5 @@ dependencies {
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse-strict-encrypt')
     integrationTestJavaImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
-    integrationTestJavaImplementation libs.testcontainers.clickhouse
+    integrationTestJavaImplementation libs.connectors.source.testcontainers.clickhouse
 }

airbyte-integrations/connectors/source-clickhouse/build.gradle

@@ -22,5 +22,5 @@ dependencies {
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse')
     integrationTestJavaImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
-    integrationTestJavaImplementation libs.testcontainers.clickhouse
+    integrationTestJavaImplementation libs.connectors.source.testcontainers.clickhouse
 }

airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/build.gradle

@@ -17,9 +17,9 @@ dependencies {
     implementation project(':airbyte-integrations:connectors:source-relational-db')
     implementation project(':airbyte-integrations:connectors:source-cockroachdb')
 
-    implementation libs.testcontainers
-    implementation libs.testcontainers.jdbc
-    implementation libs.testcontainers.cockroachdb
+    implementation libs.connectors.testcontainers
+    implementation libs.connectors.testcontainers.jdbc
+    implementation libs.connectors.testcontainers.cockroachdb
     implementation libs.postgresql
 
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-cockroachdb')

airbyte-integrations/connectors/source-cockroachdb/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
 
-    testImplementation libs.testcontainers.cockroachdb
+    testImplementation libs.connectors.testcontainers.cockroachdb
     testImplementation 'org.apache.commons:commons-lang3:3.11'
 
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-cockroachdb')

airbyte-integrations/connectors/source-db2-strict-encrypt/build.gradle

@@ -22,7 +22,7 @@ dependencies {
 
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
     testImplementation project(':airbyte-test-utils')
-    testImplementation libs.testcontainers.db2
+    testImplementation libs.connectors.testcontainers.db2
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-db2')

airbyte-integrations/connectors/source-db2/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
     testImplementation project(':airbyte-test-utils')
-    testImplementation libs.testcontainers.db2
+    testImplementation libs.connectors.testcontainers.db2
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-db2')

airbyte-integrations/connectors/source-jdbc/build.gradle

@@ -28,10 +28,10 @@ dependencies {
     testImplementation project(':airbyte-test-utils')
 
     testImplementation libs.postgresql
-    testImplementation libs.testcontainers.postgresql
+    testImplementation libs.connectors.testcontainers.postgresql
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
-    integrationTestJavaImplementation libs.testcontainers.postgresql
+    integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
 
     testFixturesImplementation "org.hamcrest:hamcrest-all:1.3"
     testFixturesImplementation project(':airbyte-protocol:protocol-models')

airbyte-integrations/connectors/source-kafka/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-kafka')
-    integrationTestJavaImplementation libs.testcontainers.kafka
+    integrationTestJavaImplementation libs.connectors.testcontainers.kafka
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
 }

airbyte-integrations/connectors/source-mongodb-v2/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 
     implementation 'org.mongodb:mongodb-driver-sync:4.4.0'
 
-    testImplementation libs.testcontainers.mongodb
+    testImplementation libs.connectors.testcontainers.mongodb
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-mongodb-v2')

airbyte-integrations/connectors/source-mssql-strict-encrypt/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
 
     testImplementation 'org.apache.commons:commons-lang3:3.11'
-    testImplementation libs.testcontainers.mssqlserver
+    testImplementation libs.connectors.testcontainers.mssqlserver
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
     integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-mssql-strict-encrypt')