Skip to content

Commit

Permalink
Merge pull request #8659 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez authored May 21, 2024
2 parents ced5b72 + 3fe2bb6 commit 874ca87
Show file tree
Hide file tree
Showing 67 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-docs-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
git diff
- name: Create Pull Request
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
with:
title: Update docs version to ${GITHUB_REF##*/}
body: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-testcontainers-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
git diff
- name: Create Pull Request
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v3.10.1
with:
title: Update testcontainers version to ${GITHUB_REF##*/}
body: |
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ dependencies {
}
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'redis.clients:jedis:5.1.0'
testImplementation 'com.rabbitmq:amqp-client:5.20.0'
testImplementation 'com.rabbitmq:amqp-client:5.21.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

testImplementation ('org.mockito:mockito-core:4.11.0') {
Expand All @@ -120,12 +120,12 @@ dependencies {
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'

jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
jarFileTestImplementation 'junit:junit:4.13.2'
jarFileTestImplementation 'org.assertj:assertj-core:3.25.1'
jarFileTestImplementation 'org.assertj:assertj-core:3.25.3'
jarFileTestImplementation 'org.ow2.asm:asm-debug-all:5.2'
}

Expand Down
2 changes: 1 addition & 1 deletion docs/examples/junit4/generic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
testImplementation project(":mysql")

testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"
testImplementation "org.seleniumhq.selenium:selenium-api:4.21.0"
testImplementation 'org.assertj:assertj-core:3.25.2'
}

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.3.1.RELEASE"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.1"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
testImplementation project(":testcontainers")
testImplementation project(":junit-jupiter")
testImplementation 'org.assertj:assertj-core:3.25.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.17.0')
implementation platform('org.seleniumhq.selenium:selenium-bom:4.21.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.6'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.25.2'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.25.2'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

test {
Expand Down
4 changes: 2 additions & 2 deletions examples/nats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ repositories {
dependencies {
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'io.nats:jnats:2.17.2'
testImplementation 'io.nats:jnats:2.18.1'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.13'
testImplementation 'org.testcontainers:neo4j'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}
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.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.assertj:assertj-core:3.25.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.25.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.25.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.14'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

test {
Expand Down
4 changes: 2 additions & 2 deletions examples/solr-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ dependencies {
compileOnly "org.projectlombok:lombok:1.18.30"
annotationProcessor "org.projectlombok:lombok:1.18.30"

implementation 'org.apache.solr:solr-solrj:8.11.2'
implementation 'org.apache.solr:solr-solrj:8.11.3'

testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:solr'
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

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.25.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion modules/activemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':testcontainers')

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation "org.apache.activemq:activemq-client:6.0.1"
testImplementation "org.apache.activemq:activemq-client:6.1.2"
testImplementation "org.apache.activemq:artemis-jakarta-client:2.31.2"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ dependencies {
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.12.0'

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'com.azure:azure-cosmos:4.54.0'
}
2 changes: 1 addition & 1 deletion modules/cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
api "com.datastax.cassandra:cassandra-driver-core:3.10.0"

testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/chromadb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: ChromaDB"
dependencies {
api project(':testcontainers')

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'io.rest-assured:rest-assured:5.4.0'
}
2 changes: 1 addition & 1 deletion modules/clickhouse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {

testImplementation project(':jdbc-test')
testRuntimeOnly 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.2'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/cockroachdb/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 'org.postgresql:postgresql:42.7.1'
testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
testImplementation 'org.assertj:assertj-core:3.25.1'
}
4 changes: 2 additions & 2 deletions 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.12.0'

testImplementation 'com.couchbase.client:java-client:3.5.2'
testImplementation 'com.couchbase.client:java-client:3.6.2'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/database-commons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
dependencies {
api project(':testcontainers')

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/db2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies {

testImplementation project(':jdbc-test')
testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
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.643'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.726'
testImplementation 'org.assertj:assertj-core:3.25.2'
}
4 changes: 2 additions & 2 deletions 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.12.0"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.13.4"
testImplementation "org.elasticsearch.client:transport:7.17.17"
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
4 changes: 2 additions & 2 deletions modules/gcloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')

testImplementation platform("com.google.cloud:libraries-bom:26.30.0")
testImplementation platform("com.google.cloud:libraries-bom:26.39.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
testImplementation 'com.google.cloud:google-cloud-pubsub'
testImplementation 'com.google.cloud:google-cloud-spanner'
testImplementation 'com.google.cloud:google-cloud-bigtable'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
8 changes: 4 additions & 4 deletions modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ dependencies {
api("org.jetbrains:annotations:24.1.0")

shaded("org.apache.commons:commons-lang3:3.14.0")
shaded("commons-io:commons-io:2.15.1")
shaded("commons-io:commons-io:2.16.1")
shaded("org.javassist:javassist:3.30.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:5.10.1")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
testImplementation("com.hivemq:hivemq-extension-sdk:4.28.1")
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.14")
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
}

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 @@ -5,7 +5,7 @@ dependencies {

compileOnly 'org.influxdb:influxdb-java:2.24'

testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'org.influxdb:influxdb-java:2.24'
testImplementation "com.influxdb:influxdb-client-java:6.12.0"
}
4 changes: 2 additions & 2 deletions modules/jdbc-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
dependencies {
api project(':jdbc')

api 'com.google.guava:guava:33.0.0-jre'
api 'com.google.guava:guava:33.2.0-jre'
api 'org.apache.commons:commons-lang3:3.14.0'
api 'com.zaxxer:HikariCP-java6:2.3.13'
api 'commons-dbutils:commons-dbutils:1.8.1'

api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'

api 'org.assertj:assertj-core:3.25.1'
api 'org.assertj:assertj-core:3.25.3'

api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
api 'org.vibur:vibur-dbcp:25.0'
Expand Down
4 changes: 2 additions & 2 deletions modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies {
compileOnly 'org.jetbrains:annotations:24.1.0'
testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
testImplementation 'org.vibur:vibur-dbcp:25.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.18'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.24'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
}
Expand Down
4 changes: 2 additions & 2 deletions modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ dependencies {
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'org.junit.jupiter:junit-jupiter'

testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
}

Expand Down
4 changes: 2 additions & 2 deletions 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.10.0'
testImplementation 'io.fabric8:kubernetes-client:6.12.1'
testImplementation 'io.kubernetes:client-java:19.0.0'
testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/k6/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ description = "Testcontainers :: k6"
dependencies {
api project(':testcontainers')

testImplementation 'org.assertj:assertj-core:3.25.2'
testImplementation 'org.assertj:assertj-core:3.25.3'
}
2 changes: 1 addition & 1 deletion modules/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
dependencies {
api project(':testcontainers')

testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
testImplementation 'org.apache.kafka:kafka-clients:3.7.0'
testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation 'com.google.guava:guava:23.0'
}
Loading

0 comments on commit 874ca87

Please sign in to comment.