Skip to content

Commit

Permalink
Merge pull request #7807 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez authored Nov 14, 2023
2 parents ec5290c + d92f846 commit dc37a4c
Show file tree
Hide file tree
Showing 36 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v4.0.0
uses: github/combine-prs@v4.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ dependencies {
}
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'redis.clients:jedis:5.0.2'
testImplementation 'com.rabbitmq:amqp-client:5.19.0'
testImplementation 'com.rabbitmq:amqp-client:5.20.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

testImplementation ('org.mockito:mockito-core:4.11.0') {
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/junit5/redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {

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

dependencies {
implementation platform('org.seleniumhq.selenium:selenium-bom:4.14.1')
implementation platform('org.seleniumhq.selenium:selenium-bom:4.15.0')
implementation 'org.seleniumhq.selenium:selenium-remote-driver'
implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
Expand Down
2 changes: 1 addition & 1 deletion examples/hazelcast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testImplementation 'com.hazelcast:hazelcast:5.3.4'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/immudb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/kafka-cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/nats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
testImplementation 'io.nats:jnats:2.17.1'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/neo4j-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
testImplementation 'org.testcontainers:neo4j'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}
2 changes: 1 addition & 1 deletion examples/redis-backed-cache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/selenium-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
testImplementation 'org.testcontainers:selenium'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/sftp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/singleton-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/solr-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:solr'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/spring-boot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
runtimeOnly 'org.postgresql:postgresql'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/zookeeper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.11'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
}

test {
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.12.0'

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.azure:azure-cosmos:4.51.0'
testImplementation 'com.azure:azure-cosmos:4.52.0'
}
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.572'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.572'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.587'
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.10.4"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.11.1"
testImplementation "org.elasticsearch.client:transport:7.17.14"
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.25.0")
testImplementation platform("com.google.cloud:libraries-bom:26.27.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
Expand Down
8 changes: 4 additions & 4 deletions modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ dependencies {
api("org.jetbrains:annotations:24.0.1")

shaded("org.apache.commons:commons-lang3:3.13.0")
shaded("commons-io:commons-io:2.14.0")
shaded("commons-io:commons-io:2.15.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.10.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.21.0")
testImplementation("com.hivemq:hivemq-extension-sdk:4.22.0")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
testImplementation("ch.qos.logback:logback-classic:1.4.11")
testImplementation 'org.assertj:assertj-core:3.24.2'
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
}

test {
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.10.0')
implementation platform('org.junit:junit-bom:5.10.1')
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.9.0'
testImplementation 'io.fabric8:kubernetes-client:6.9.2'
testImplementation 'io.kubernetes:client-java:19.0.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies {
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.21.5'
testImplementation 'software.amazon.awssdk:s3:2.21.22'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/mariadb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'

testImplementation project(':jdbc-test')
testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.2.0'
testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.3.0'

testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
Expand Down
2 changes: 1 addition & 1 deletion modules/minio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MinIO"
dependencies {
api project(':testcontainers')

testImplementation("io.minio:minio:8.5.6")
testImplementation("io.minio:minio:8.5.7")
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,7 +3,7 @@ description = "Testcontainers :: MongoDB"
dependencies {
api project(':testcontainers')

testImplementation("org.mongodb:mongodb-driver-sync:4.11.0")
testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
testImplementation 'org.assertj:assertj-core:3.24.2'
}

Expand Down
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.2.RELEASE'

testImplementation project(':jdbc-test')
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.1.jre8'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.2.jre8'

testImplementation project(':r2dbc')
testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
Expand Down
4 changes: 2 additions & 2 deletions modules/oracle-free/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ dependencies {
api project(':jdbc')

compileOnly project(':r2dbc')
compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

testImplementation project(':jdbc-test')
testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'

compileOnly 'org.jetbrains:annotations:24.0.1'

testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
}

test {
Expand Down
4 changes: 2 additions & 2 deletions modules/oracle-xe/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ dependencies {
api project(':jdbc')

compileOnly project(':r2dbc')
compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'

testImplementation project(':jdbc-test')
testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'

compileOnly 'org.jetbrains:annotations:24.0.1'

testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
}

test {
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.23"
api "com.orientechnologies:orientdb-client:3.2.24"

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.0'
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.23"
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.24"
}
4 changes: 2 additions & 2 deletions modules/pulsar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
dependencies {
api project(':testcontainers')

testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
}
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.3.3'
testImplementation 'org.questdb:questdb:7.3.4'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/rabbitmq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"

dependencies {
api project(":testcontainers")
testImplementation 'com.rabbitmq:amqp-client:5.19.0'
testImplementation 'com.rabbitmq:amqp-client:5.20.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
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.10.0'
testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.0'
testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.1'

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:430'
testRuntimeOnly 'io.trino:trino-jdbc:433'
compileOnly 'org.jetbrains:annotations:24.0.1'
}

0 comments on commit dc37a4c

Please sign in to comment.