Skip to content

Commit

Permalink
Merge pull request #5492 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez authored Jun 14, 2022
2 parents 7f9293b + 55ffac8 commit 6285e69
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ configurations.all {

dependencies {
api 'junit:junit:4.13.2'
api 'org.slf4j:slf4j-api:1.7.35'
api 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.jetbrains:annotations:23.0.0'
testCompileClasspath 'org.jetbrains:annotations:23.0.0'
api 'org.apache.commons:commons-compress:1.21'
Expand Down Expand Up @@ -89,7 +89,7 @@ dependencies {
testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:4.2.3'
testImplementation 'com.rabbitmq:amqp-client:5.14.2'
testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
testImplementation 'org.mongodb:mongo-java-driver:3.12.11'

testImplementation ('org.mockito:mockito-core:4.6.0') {
exclude(module: 'hamcrest-core')
Expand Down
2 changes: 1 addition & 1 deletion examples/cucumber/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies {
implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
testImplementation 'io.cucumber:cucumber-java:7.2.3'
testImplementation 'io.cucumber:cucumber-junit:7.2.3'
testImplementation 'io.cucumber:cucumber-junit:7.3.4'
testImplementation 'org.testcontainers:selenium'
}
2 changes: 1 addition & 1 deletion examples/linked-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'org.json:json:20211205'
implementation 'org.json:json:20220320'
testImplementation 'org.postgresql:postgresql:42.3.6'
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
testImplementation 'org.testcontainers:postgresql'
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache-testng/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'redis.clients:jedis:4.2.2'
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'redis.clients:jedis:4.2.2'
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
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 @@ -8,7 +8,7 @@ repositories {

dependencies {

implementation 'redis.clients:jedis:4.2.2'
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
Expand Down
2 changes: 1 addition & 1 deletion examples/spring-boot-kotlin-redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("org.springframework.boot") version "2.6.4"
id("org.jetbrains.kotlin.jvm") version "1.6.21"
id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
id("org.jetbrains.kotlin.plugin.spring") version "1.6.21"
}

apply plugin: 'io.spring.dependency-management'
Expand Down
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
shaded 'com.squareup.okhttp3:okhttp:3.14.9'

testImplementation 'com.couchbase.client:java-client:3.3.0'
testImplementation 'org.awaitility:awaitility:4.1.1'
testImplementation 'org.awaitility:awaitility:4.2.0'
}
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:7.16.2"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.2.2"
testImplementation "org.elasticsearch.client:transport:7.17.4"
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
6 changes: 3 additions & 3 deletions modules/gcloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')

testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
testImplementation 'com.google.cloud:google-cloud-datastore:2.7.0'
testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.119.0'
testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
testImplementation 'com.google.cloud:google-cloud-spanner:6.25.5'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.8.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
testImplementation("com.hivemq:hivemq-extension-sdk:4.8.1")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
testImplementation("ch.qos.logback:logback-classic:1.2.10")
testImplementation("ch.qos.logback:logback-classic:1.2.11")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
}

Expand Down
6 changes: 3 additions & 3 deletions modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:4.2.2'
testImplementation 'redis.clients:jedis:4.2.3'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:4.4.0') {
testImplementation ('org.mockito:mockito-core:4.6.1') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'

testRuntimeOnly 'org.postgresql:postgresql:42.3.6'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
}

Expand Down
2 changes: 1 addition & 1 deletion modules/k3s/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ dependencies {
shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'

testImplementation 'io.fabric8:kubernetes-client:5.12.2'
testImplementation 'io.kubernetes:client-java:15.0.0'
testImplementation 'io.kubernetes:client-java:15.0.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
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.0.0'
testImplementation 'org.apache.kafka:kafka-clients:3.2.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.google.guava:guava:23.0'
}
4 changes: 2 additions & 2 deletions modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies {

compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.231'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.231'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.233'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.232'
testImplementation 'software.amazon.awssdk:s3:2.17.181'
testImplementation 'software.amazon.awssdk:s3:2.17.204'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
dependencies {
api project(':testcontainers')

testImplementation("org.mongodb:mongodb-driver-sync:4.5.1")
testImplementation("org.mongodb:mongodb-driver-sync:4.6.0")
}
2 changes: 1 addition & 1 deletion modules/postgresql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
api project(':jdbc')

compileOnly project(':r2dbc')
compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'

testImplementation project(':jdbc-test')
testImplementation project(':test-support')
Expand Down
4 changes: 2 additions & 2 deletions modules/r2dbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ dependencies {
api project(':testcontainers')
api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'

testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
testImplementation project(':postgresql')

testFixturesImplementation 'io.projectreactor:reactor-core:3.4.18'
testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/vault/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':testcontainers')

testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
testImplementation 'io.rest-assured:rest-assured:5.0.1'
testImplementation 'io.rest-assured:rest-assured:5.1.0'
testImplementation 'org.assertj:assertj-core:3.23.1'

}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}
}
dependencies {
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7"
}
}
Expand Down

0 comments on commit 6285e69

Please sign in to comment.