Skip to content

Commit

Permalink
Merge pull request #9005 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez authored Jul 26, 2024
2 parents e9a408b + ab243d6 commit da05109
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencies {

api 'com.github.docker-java:docker-java-transport-zerodep'

shaded 'com.google.guava:guava:33.2.0-jre'
shaded 'com.google.guava:guava:33.2.1-jre'
shaded "org.yaml:snakeyaml:1.33"

shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/junit4/redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
description = "Examples for docs"

dependencies {
api "io.lettuce:lettuce-core:6.3.1.RELEASE"
api "io.lettuce:lettuce-core:6.3.2.RELEASE"

testImplementation "junit:junit:4.13.2"
testImplementation project(":testcontainers")
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/junit5/redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
description = "Examples for docs"

dependencies {
api "io.lettuce:lettuce-core:6.3.1.RELEASE"
api "io.lettuce:lettuce-core:6.3.2.RELEASE"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.3"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/spock/redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
api "io.lettuce:lettuce-core:6.3.1.RELEASE"
api "io.lettuce:lettuce-core:6.3.2.RELEASE"
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testImplementation project(":spock")
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
Expand Down
6 changes: 3 additions & 3 deletions examples/kafka-cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ repositories {
}

dependencies {
testCompileOnly "org.projectlombok:lombok:1.18.30"
testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
testCompileOnly "org.projectlombok:lombok:1.18.34"
testAnnotationProcessor "org.projectlombok:lombok:1.18.34"
testImplementation 'org.testcontainers:kafka'
testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
testImplementation 'org.apache.kafka:kafka-clients:3.7.1'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
Expand Down
2 changes: 1 addition & 1 deletion examples/linked-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'org.json:json:20231013'
testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'org.assertj:assertj-core:3.26.3'
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 @@ -8,7 +8,7 @@ repositories {

dependencies {
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
testImplementation 'org.testcontainers:neo4j'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
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.36'
implementation 'redis.clients:jedis:5.1.0'
implementation 'redis.clients:jedis:5.1.3'
implementation 'com.google.code.gson:gson:2.10.1'
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.36'
implementation 'redis.clients:jedis:5.1.0'
implementation 'redis.clients:jedis:5.1.3'
implementation 'com.google.code.gson:gson:2.10.1'
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:5.1.0'
implementation 'redis.clients:jedis:5.1.3'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.36'
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 @@ -7,8 +7,8 @@ repositories {
}

dependencies {
compileOnly "org.projectlombok:lombok:1.18.30"
annotationProcessor "org.projectlombok:lombok:1.18.30"
compileOnly "org.projectlombok:lombok:1.18.34"
annotationProcessor "org.projectlombok:lombok:1.18.34"

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

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

testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation "org.apache.activemq:activemq-client:6.1.2"
testImplementation "org.apache.activemq:artemis-jakarta-client:2.33.0"
testImplementation "org.apache.activemq:artemis-jakarta-client:2.35.0"
}

test {
Expand Down
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.763'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.763'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.765'
testImplementation 'org.assertj:assertj-core:3.26.3'
}
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.12.1'
testImplementation 'io.fabric8:kubernetes-client:6.13.1'
testImplementation 'io.kubernetes:client-java:20.0.1-legacy'
testImplementation 'org.assertj:assertj-core:3.26.3'
}
2 changes: 1 addition & 1 deletion modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies {
testImplementation 'com.amazonaws:aws-java-sdk-lambda'
testImplementation 'com.amazonaws:aws-java-sdk-core'
testImplementation 'software.amazon.awssdk:s3:2.26.25'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'org.assertj:assertj-core:3.26.3'
}
2 changes: 1 addition & 1 deletion modules/milvus/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Milvus"
dependencies {
api project(':testcontainers')

testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation('io.milvus:milvus-sdk-java:2.4.2') {
exclude(group: 'org.testcontainers', module: 'milvus')
exclude(group: 'org.testcontainers', module: 'junit-jupiter')
Expand Down
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testRuntimeOnly 'org.postgresql:postgresql:42.7.3'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.10.3'

testCompileOnly 'org.jetbrains:annotations:24.1.0'
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:452'
testRuntimeOnly 'io.trino:trino-jdbc:453'
compileOnly 'org.jetbrains:annotations:24.1.0'
}

0 comments on commit da05109

Please sign in to comment.