Skip to content

Commit

Permalink
Merge pull request #7388 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Aug 2, 2023
2 parents 1a60247 + f42ab16 commit 9b24483
Show file tree
Hide file tree
Showing 30 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
labels: dependencies

- uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.3
- uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.0.3
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
plugins {
id 'io.franzbecker.gradle-lombok' version '5.0.0'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
id 'me.champeau.gradle.japicmp' version '0.4.2' apply false
id 'com.diffplug.spotless' version '6.13.0' apply false
}

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/junit5/redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description = "Examples for docs"
dependencies {
api "io.lettuce:lettuce-core:6.2.3.RELEASE"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
testImplementation project(":testcontainers")
testImplementation project(":junit-jupiter")
testImplementation 'org.assertj:assertj-core:3.24.2'
Expand Down
4 changes: 2 additions & 2 deletions examples/cucumber/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ repositories {
}

dependencies {
implementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
implementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
implementation 'org.seleniumhq.selenium:selenium-remote-driver'
implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
implementation 'org.seleniumhq.selenium:selenium-chrome-driver'

testImplementation platform('io.cucumber:cucumber-bom:7.12.1')
testImplementation platform('io.cucumber:cucumber-bom:7.13.0')
testImplementation 'io.cucumber:cucumber-java'
testImplementation 'io.cucumber:cucumber-junit'
testImplementation 'org.testcontainers:selenium'
Expand Down
2 changes: 1 addition & 1 deletion examples/nats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
dependencies {
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'io.nats:jnats:2.16.10'
testImplementation 'io.nats:jnats:2.16.13'
testImplementation 'ch.qos.logback:logback-classic:1.3.8'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
}
2 changes: 1 addition & 1 deletion examples/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
dependencies {
classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.6"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/zookeeper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}

dependencies {
testImplementation 'org.apache.curator:curator-framework:5.4.0'
testImplementation 'org.apache.curator:curator-framework:5.5.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.8'
Expand Down
2 changes: 1 addition & 1 deletion modules/azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
shaded 'com.squareup.okhttp3:okhttp:4.11.0'

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.azure:azure-cosmos:4.47.0'
testImplementation 'com.azure:azure-cosmos:4.48.0'
}
2 changes: 1 addition & 1 deletion modules/cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dependencies {
api project(":database-commons")
api "com.datastax.cassandra:cassandra-driver-core:3.10.0"

testImplementation 'com.datastax.oss:java-driver-core:4.16.0'
testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.11.0'

testImplementation 'com.couchbase.client:java-client:3.4.7'
testImplementation 'com.couchbase.client:java-client:3.4.8'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
4 changes: 2 additions & 2 deletions modules/dynalite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"

dependencies {
api project(':testcontainers')
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.8.2"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.0"
testImplementation "org.elasticsearch.client:transport:7.17.11"
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/gcloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')

testImplementation platform("com.google.cloud:libraries-bom:26.18.0")
testImplementation platform("com.google.cloud:libraries-bom:26.21.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
Expand Down
6 changes: 3 additions & 3 deletions modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ dependencies {
api(project(":testcontainers"))
api("org.jetbrains:annotations:24.0.1")

shaded("org.apache.commons:commons-lang3:3.12.0")
shaded("org.apache.commons:commons-lang3:3.13.0")
shaded("commons-io:commons-io:2.13.0")
shaded("org.javassist:javassist:3.29.2-GA")
shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
shaded("net.lingala.zip4j:zip4j:2.11.5")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
testImplementation("ch.qos.logback:logback-classic:1.4.8")
testImplementation 'org.assertj:assertj-core:3.24.2'
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
}

test {
Expand Down
2 changes: 1 addition & 1 deletion modules/influxdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependencies {

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.influxdb:influxdb-java:2.23'
testImplementation "com.influxdb:influxdb-client-java:6.9.0"
testImplementation "com.influxdb:influxdb-client-java:6.10.0"
}
2 changes: 1 addition & 1 deletion modules/jdbc-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
api project(':jdbc')

api 'com.google.guava:guava:32.1.1-jre'
api 'com.google.guava:guava:32.1.2-jre'
api 'org.apache.commons:commons-lang3:3.12.0'
api 'com.zaxxer:HikariCP-java6:2.3.13'
api 'commons-dbutils:commons-dbutils:1.7'
Expand Down
2 changes: 1 addition & 1 deletion modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
compileOnly 'org.jetbrains:annotations:24.0.1'
testImplementation 'commons-dbutils:commons-dbutils:1.7'
testImplementation 'org.vibur:vibur-dbcp:25.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.10'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.11'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation ('org.mockito:mockito-core:4.11.0') {
Expand Down
2 changes: 1 addition & 1 deletion modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"

dependencies {
api project(':testcontainers')
implementation platform('org.junit:junit-bom:5.9.3')
implementation platform('org.junit:junit-bom:5.10.0')
implementation 'org.junit.jupiter:junit-jupiter-api'

testImplementation project(':mysql')
Expand Down
2 changes: 1 addition & 1 deletion modules/k3s/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
// Any >2.8 version here is not compatible with jackson-databind 2.8.x.
shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'

testImplementation 'io.fabric8:kubernetes-client:6.7.2'
testImplementation 'io.fabric8:kubernetes-client:6.8.0'
testImplementation 'io.kubernetes:client-java:18.0.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
4 changes: 2 additions & 2 deletions modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
dependencies {
api project(':testcontainers')

testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.500")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.520")
testImplementation 'com.amazonaws:aws-java-sdk-s3'
testImplementation 'com.amazonaws:aws-java-sdk-sqs'
testImplementation 'com.amazonaws:aws-java-sdk-logs'
testImplementation 'software.amazon.awssdk:s3:2.20.97'
testImplementation 'software.amazon.awssdk:s3:2.20.117'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
dependencies {
api project(':testcontainers')

testImplementation("org.mongodb:mongodb-driver-sync:4.10.1")
testImplementation("org.mongodb:mongodb-driver-sync:4.10.2")
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/mssqlserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'

testImplementation project(':jdbc-test')
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.1.jre8-preview'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8-preview'

testImplementation project(':r2dbc')
testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.1.RELEASE'
Expand Down
4 changes: 2 additions & 2 deletions modules/orientdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description = "Testcontainers :: Orientdb"
dependencies {
api project(":testcontainers")

api "com.orientechnologies:orientdb-client:3.2.20"
api "com.orientechnologies:orientdb-client:3.2.21"

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.20"
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.21"
}
2 changes: 1 addition & 1 deletion modules/questdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
testImplementation project(':jdbc-test')
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.questdb:questdb:7.2'
testImplementation 'org.questdb:questdb:7.2.1'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/r2dbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencies {
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
testImplementation project(':postgresql')

testFixturesImplementation 'io.projectreactor:reactor-core:3.5.7'
testFixturesImplementation 'io.projectreactor:reactor-core:3.5.8'
testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/redpanda/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
dependencies {
api project(':testcontainers')

testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'io.rest-assured:rest-assured:5.3.1'
}
2 changes: 1 addition & 1 deletion modules/selenium/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
provided 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0'
provided 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0'

testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.10.0')
testImplementation platform('org.seleniumhq.selenium:selenium-bom:4.11.0')
testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver'
testImplementation 'org.seleniumhq.selenium:selenium-edge-driver'
testImplementation 'org.seleniumhq.selenium:selenium-support'
Expand Down
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.3'
testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.3'
testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.0'

testCompileOnly 'org.jetbrains:annotations:24.0.1'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/trino/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies {
api project(':jdbc')

testImplementation project(':jdbc-test')
testRuntimeOnly 'io.trino:trino-jdbc:420'
testRuntimeOnly 'io.trino:trino-jdbc:422'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.4"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1"
classpath "org.gradle.toolchains:foojay-resolver:0.4.0"
}
}
Expand Down

0 comments on commit 9b24483

Please sign in to comment.