diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle index 50b7d9caf32..d5bdd39e3f9 100644 --- a/docs/examples/junit4/generic/build.gradle +++ b/docs/examples/junit4/generic/build.gradle @@ -3,8 +3,8 @@ description = "Examples for docs" dependencies { testImplementation "junit:junit:4.13.2" testImplementation project(":testcontainers") - testImplementation project(":selenium") - testImplementation project(":mysql") + testImplementation project(":testcontainers-selenium") + testImplementation project(":testcontainers-mysql") testRuntimeOnly 'mysql:mysql-connector-java:8.0.33' testImplementation "org.seleniumhq.selenium:selenium-api:4.34.0" diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle index 60e78fc589d..f03bc7cdf4c 100644 --- a/docs/examples/junit5/redis/build.gradle +++ b/docs/examples/junit5/redis/build.gradle @@ -8,7 +8,7 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3' testImplementation project(":testcontainers") - testImplementation project(":junit-jupiter") + testImplementation project(":testcontainers-junit-jupiter") testImplementation 'org.assertj:assertj-core:3.27.3' } diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle index d6fd81a8370..2b82febefb6 100644 --- a/docs/examples/spock/redis/build.gradle +++ b/docs/examples/spock/redis/build.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api "io.lettuce:lettuce-core:6.7.1.RELEASE" testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' - testImplementation project(":spock") + testImplementation project(":testcontainers-spock") testImplementation 'ch.qos.logback:logback-classic:1.3.15' } diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle index 79ce094b656..e671b26d454 100644 --- a/examples/cucumber/build.gradle +++ b/examples/cucumber/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation platform('io.cucumber:cucumber-bom:7.27.0') testImplementation 'io.cucumber:cucumber-java' testImplementation 'io.cucumber:cucumber-junit-platform-engine' - testImplementation 'org.testcontainers:selenium' + testImplementation 'org.testcontainers:testcontainers-selenium' testImplementation 'org.assertj:assertj-core:3.27.3' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3' } diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle index 02f161b224a..1d349ba33ec 100644 --- a/examples/immudb/build.gradle +++ b/examples/immudb/build.gradle @@ -9,7 +9,7 @@ repositories { dependencies { implementation 'io.codenotary:immudb4j:1.0.1' testImplementation 'org.testcontainers:testcontainers' - testImplementation 'org.testcontainers:junit-jupiter' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter' testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'com.google.guava:guava:23.0' testImplementation 'ch.qos.logback:logback-classic:1.3.15' diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle index e5c09635a89..4483b006709 100644 --- a/examples/kafka-cluster/build.gradle +++ b/examples/kafka-cluster/build.gradle @@ -9,7 +9,7 @@ repositories { dependencies { testCompileOnly "org.projectlombok:lombok:1.18.38" testAnnotationProcessor "org.projectlombok:lombok:1.18.38" - testImplementation 'org.testcontainers:kafka' + testImplementation 'org.testcontainers:testcontainers-kafka' testImplementation 'org.apache.kafka:kafka-clients:4.0.0' testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'com.google.guava:guava:23.0' diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle index ebcd5462bbf..cb7a334b712 100644 --- a/examples/neo4j-container/build.gradle +++ b/examples/neo4j-container/build.gradle @@ -9,8 +9,8 @@ repositories { dependencies { testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.20' - testImplementation 'org.testcontainers:neo4j' - testImplementation 'org.testcontainers:junit-jupiter' + testImplementation 'org.testcontainers:testcontainers-neo4j' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0' } diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle index c8f478b2eb4..800136bc628 100644 --- a/examples/ollama-hugging-face/build.gradle +++ b/examples/ollama-hugging-face/build.gradle @@ -7,7 +7,7 @@ repositories { } dependencies { - testImplementation 'org.testcontainers:ollama' + testImplementation 'org.testcontainers:testcontainers-ollama' testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'ch.qos.logback:logback-classic:1.3.15' testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle index abd647930e1..b6a4e47f094 100644 --- a/examples/redis-backed-cache/build.gradle +++ b/examples/redis-backed-cache/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.13.1' implementation 'com.google.guava:guava:23.0' testImplementation 'org.testcontainers:testcontainers' - testImplementation 'org.testcontainers:junit-jupiter' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' testImplementation 'ch.qos.logback:logback-classic:1.3.15' testImplementation 'org.assertj:assertj-core:3.27.3' diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle index f78ecc536ac..3629b3de78e 100644 --- a/examples/selenium-container/build.gradle +++ b/examples/selenium-container/build.gradle @@ -14,8 +14,8 @@ dependencies { implementation 'org.seleniumhq.selenium:selenium-chrome-driver' implementation 'org.springframework.boot:spring-boot-starter-web' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:selenium' - testImplementation 'org.testcontainers:junit-jupiter' + testImplementation 'org.testcontainers:testcontainers-selenium' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter' testImplementation 'org.assertj:assertj-core:3.27.3' testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2" } diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle index 7c0ee785318..8cef396fe61 100644 --- a/examples/solr-container/build.gradle +++ b/examples/solr-container/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation 'org.apache.solr:solr-solrj:8.11.4' testImplementation 'org.testcontainers:testcontainers' - testImplementation 'org.testcontainers:solr' + testImplementation 'org.testcontainers:testcontainers-solr' testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0' diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle index 2001c393afa..e3a40d27f06 100644 --- a/examples/spring-boot/build.gradle +++ b/examples/spring-boot/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' runtimeOnly 'org.postgresql:postgresql' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:postgresql' + testImplementation 'org.testcontainers:testcontainers-postgresql' testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.8.2" } diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle index 18cf96527b3..13f3f353ba9 100644 --- a/modules/azure/build.gradle +++ b/modules/azure/build.gradle @@ -2,7 +2,7 @@ description = "Testcontainers :: Azure" dependencies { api project(':testcontainers') - api project(':mssqlserver') + api project(':testcontainers-mssqlserver') // TODO use JDK's HTTP client and/or Apache HttpClient5 shaded 'com.squareup.okhttp3:okhttp:5.1.0' diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle index e146c26e69e..42c503f6752 100644 --- a/modules/cassandra/build.gradle +++ b/modules/cassandra/build.gradle @@ -7,7 +7,7 @@ configurations.all { } dependencies { - api project(":database-commons") + api project(":testcontainers-database-commons") api "com.datastax.cassandra:cassandra-driver-core:3.10.0" testImplementation 'com.datastax.oss:java-driver-core:4.17.0' diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle index 8fabc3a3397..f0c57fe8c36 100644 --- a/modules/clickhouse/build.gradle +++ b/modules/clickhouse/build.gradle @@ -2,18 +2,18 @@ description = "Testcontainers :: JDBC :: ClickHouse" dependencies { api project(':testcontainers') - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.2', classifier: 'http') testRuntimeOnly(group: 'com.clickhouse', name: 'jdbc-v2', version: '0.7.2', classifier: 'http') testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2' testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'com.clickhouse:client-v2:0.9.0' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.2', classifier: 'http') } diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle index 6340d918e7e..a1967c94fbd 100644 --- a/modules/cockroachdb/build.gradle +++ b/modules/cockroachdb/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: CockroachDB" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'org.postgresql:postgresql:42.7.7' testImplementation 'org.assertj:assertj-core:3.27.3' } diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle index 79ca4864f46..b74d9c5f949 100644 --- a/modules/cratedb/build.gradle +++ b/modules/cratedb/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: CrateDB" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'org.postgresql:postgresql:42.7.7' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle index 392c2b51eb0..2770b2ccff3 100644 --- a/modules/databend/build.gradle +++ b/modules/databend/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: Databend" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'com.databend:databend-jdbc:0.4.0' testImplementation 'org.assertj:assertj-core:3.27.3' } diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle index 0163eb17bd6..15600ec3856 100644 --- a/modules/db2/build.gradle +++ b/modules/db2/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: DB2" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'com.ibm.db2:jcc:12.1.2.0' testImplementation 'org.assertj:assertj-core:3.27.3' } diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle index 77c1bdba8aa..9a0fda05afe 100644 --- a/modules/hivemq/build.gradle +++ b/modules/hivemq/build.gradle @@ -13,7 +13,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4' - testImplementation(project(":junit-jupiter")) + testImplementation(project(":testcontainers-junit-jupiter")) testImplementation("com.hivemq:hivemq-extension-sdk:4.42.0") testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7") testImplementation("org.apache.httpcomponents:httpclient:4.5.14") diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle index 1051af04383..b5774ce794d 100644 --- a/modules/jdbc-test/build.gradle +++ b/modules/jdbc-test/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') api 'com.google.guava:guava:33.4.8-jre' api 'org.apache.commons:commons-lang3:3.18.0' diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle index c343cd17a4a..c45f1bf65d3 100644 --- a/modules/jdbc/build.gradle +++ b/modules/jdbc/build.gradle @@ -1,7 +1,7 @@ description = "Testcontainers :: JDBC" dependencies { - api project(':database-commons') + api project(':testcontainers-database-commons') compileOnly 'org.jetbrains:annotations:26.0.2' testImplementation 'commons-dbutils:commons-dbutils:1.8.1' diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle index 20546c873cb..13652ef111b 100644 --- a/modules/junit-jupiter/build.gradle +++ b/modules/junit-jupiter/build.gradle @@ -5,8 +5,8 @@ dependencies { implementation platform('org.junit:junit-bom:5.13.4') implementation 'org.junit.jupiter:junit-jupiter-api' - testImplementation project(':mysql') - testImplementation project(':postgresql') + testImplementation project(':testcontainers-mysql') + testImplementation project(':testcontainers-postgresql') testImplementation 'com.zaxxer:HikariCP:7.0.0' testImplementation 'redis.clients:jedis:6.0.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle index 416ae4f2707..cf0b92dd5fe 100644 --- a/modules/mariadb/build.gradle +++ b/modules/mariadb/build.gradle @@ -1,15 +1,15 @@ description = "Testcontainers :: JDBC :: MariaDB" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.4' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3' } diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle index c1174c84b15..793f5b48c99 100644 --- a/modules/mssqlserver/build.gradle +++ b/modules/mssqlserver/build.gradle @@ -1,19 +1,19 @@ description = "Testcontainers :: MS SQL Server" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview' - testImplementation project(':r2dbc') + testImplementation project(':testcontainers-r2dbc') testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE' // MSSQL's wait strategy requires the JDBC driver - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) } tasks.japicmp { diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle index 3055cd141fc..ddacc0fdc50 100644 --- a/modules/mysql/build.gradle +++ b/modules/mysql/build.gradle @@ -1,15 +1,15 @@ description = "Testcontainers :: JDBC :: MySQL" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'io.asyncer:r2dbc-mysql:1.4.1' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'mysql:mysql-connector-java:8.0.33' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/modules/oceanbase/build.gradle b/modules/oceanbase/build.gradle index e1f13a7a6a1..d4278ddc0bc 100644 --- a/modules/oceanbase/build.gradle +++ b/modules/oceanbase/build.gradle @@ -1,8 +1,8 @@ description = "Testcontainers :: JDBC :: OceanBase" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'mysql:mysql-connector-java:8.0.33' } diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle index e671376497d..a55c9f26518 100644 --- a/modules/oracle-free/build.gradle +++ b/modules/oracle-free/build.gradle @@ -1,16 +1,16 @@ description = "Testcontainers :: JDBC :: Oracle Database Free" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07' compileOnly 'org.jetbrains:annotations:26.0.2' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0' } diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle index 012ba002e49..a384fcb7221 100644 --- a/modules/oracle-xe/build.gradle +++ b/modules/oracle-xe/build.gradle @@ -1,17 +1,17 @@ description = "Testcontainers :: JDBC :: Oracle XE" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testImplementation 'com.oracle.database.jdbc:ojdbc11:23.9.0.25.07' compileOnly 'org.jetbrains:annotations:26.0.2' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.3.0' } diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle index bbe8e596b95..8af61c5f3e2 100644 --- a/modules/postgresql/build.gradle +++ b/modules/postgresql/build.gradle @@ -1,15 +1,15 @@ description = "Testcontainers :: JDBC :: PostgreSQL" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - compileOnly project(':r2dbc') + compileOnly project(':testcontainers-r2dbc') compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'org.postgresql:postgresql:42.7.7' - testImplementation testFixtures(project(':r2dbc')) + testImplementation testFixtures(project(':testcontainers-r2dbc')) testRuntimeOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle index 988b00630d8..194b413c10f 100644 --- a/modules/presto/build.gradle +++ b/modules/presto/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: Presto" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'io.prestosql:presto-jdbc:350' compileOnly 'org.jetbrains:annotations:26.0.2' } diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle index 66355d19d61..954b0300ad5 100644 --- a/modules/questdb/build.gradle +++ b/modules/questdb/build.gradle @@ -2,10 +2,10 @@ description = "Testcontainers :: QuestDB" dependencies { api project(':testcontainers') - api project(':jdbc') + api project(':testcontainers-jdbc') testRuntimeOnly 'org.postgresql:postgresql:42.7.7' - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'org.questdb:questdb:9.0.1' testImplementation 'org.awaitility:awaitility:4.3.0' diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle index b506f5a2515..49f7672bd18 100644 --- a/modules/r2dbc/build.gradle +++ b/modules/r2dbc/build.gradle @@ -10,7 +10,7 @@ dependencies { testImplementation 'org.assertj:assertj-core:3.27.3' testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE' - testImplementation project(':postgresql') + testImplementation project(':testcontainers-postgresql') testFixturesImplementation 'io.projectreactor:reactor-core:3.7.8' testFixturesImplementation 'org.assertj:assertj-core:3.27.3' diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle index 10dbcd6752d..1b9312d6187 100644 --- a/modules/selenium/build.gradle +++ b/modules/selenium/build.gradle @@ -12,7 +12,7 @@ dependencies { testImplementation 'org.seleniumhq.selenium:selenium-support' testImplementation 'org.mortbay.jetty:jetty:6.1.26' - testImplementation project(':nginx') + testImplementation project(':testcontainers-nginx') testImplementation 'org.assertj:assertj-core:3.27.3' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle index 0e361b5c793..ae7f37050ba 100644 --- a/modules/spock/build.gradle +++ b/modules/spock/build.gradle @@ -8,9 +8,9 @@ dependencies { api project(':testcontainers') implementation 'org.spockframework:spock-core:2.3-groovy-4.0' - testImplementation project(':selenium') - testImplementation project(':mysql') - testImplementation project(':postgresql') + testImplementation project(':testcontainers-selenium') + testImplementation project(':testcontainers-mysql') + testImplementation project(':testcontainers-postgresql') testImplementation 'com.zaxxer:HikariCP:7.0.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle index 37a528a41ff..47dd9d01027 100644 --- a/modules/tidb/build.gradle +++ b/modules/tidb/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: TiDB" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'mysql:mysql-connector-java:8.0.33' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/modules/timeplus/build.gradle b/modules/timeplus/build.gradle index 72da2ed182f..188edeeb677 100644 --- a/modules/timeplus/build.gradle +++ b/modules/timeplus/build.gradle @@ -2,9 +2,9 @@ description = "Testcontainers :: JDBC :: Timeplus" dependencies { api project(':testcontainers') - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.10' testImplementation 'org.assertj:assertj-core:3.27.3' } diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle index f8d3a4f1307..08e3c0c2982 100644 --- a/modules/trino/build.gradle +++ b/modules/trino/build.gradle @@ -1,9 +1,9 @@ description = "Testcontainers :: JDBC :: Trino" dependencies { - api project(':jdbc') + api project(':testcontainers-jdbc') - testImplementation project(':jdbc-test') + testImplementation project(':testcontainers-jdbc-test') testRuntimeOnly 'io.trino:trino-jdbc:476' compileOnly 'org.jetbrains:annotations:26.0.2' } diff --git a/modules/yugabytedb/build.gradle b/modules/yugabytedb/build.gradle index 15540f0020a..d81dd3e0648 100644 --- a/modules/yugabytedb/build.gradle +++ b/modules/yugabytedb/build.gradle @@ -1,8 +1,8 @@ description = "Testcontainers :: JDBC :: YugabyteDB" dependencies { - api project(':jdbc') - testImplementation project(':jdbc-test') + api project(':testcontainers-jdbc') + testImplementation project(':testcontainers-jdbc-test') // YCQL driver testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1' // YSQL driver diff --git a/settings.gradle b/settings.gradle index 0099b899082..2076cb71c86 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,8 +23,8 @@ include "testcontainers" project(':testcontainers').projectDir = "$rootDir/core" as File file('modules').eachDir { dir -> - include dir.name - project(":${dir.name}").projectDir = dir + include "testcontainers-${dir.name}" + project(":testcontainers-${dir.name}").projectDir = dir } include ':docs:examples:junit4:generic'