Skip to content

Commit

Permalink
Merge pull request #7494 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Sep 2, 2023
2 parents 1084b20 + 55ddf12 commit 5cd754f
Show file tree
Hide file tree
Showing 29 changed files with 35 additions and 35 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@v3.1.1
uses: github/combine-prs@v3.1.2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
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.2.3.RELEASE"
api "io.lettuce:lettuce-core:6.2.6.RELEASE"

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

dependencies {
api "io.lettuce:lettuce-core:6.2.3.RELEASE"
api "io.lettuce:lettuce-core:6.2.6.RELEASE"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
testImplementation project(":testcontainers")
testImplementation project(":junit-jupiter")
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.2.3.RELEASE"
api "io.lettuce:lettuce-core:6.2.6.RELEASE"
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testImplementation project(":spock")
testImplementation 'ch.qos.logback:logback-classic:1.3.8'
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 @@ -10,7 +10,7 @@ dependencies {
testCompileOnly "org.projectlombok:lombok:1.18.28"
testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
testImplementation 'org.testcontainers:kafka'
testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.8'
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.13'
testImplementation 'io.nats:jnats:2.16.14'
testImplementation 'ch.qos.logback:logback-classic:1.3.8'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
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.24.2'
testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
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'
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:4.3.2'
implementation 'redis.clients:jedis:4.4.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:4.3.2'
implementation 'redis.clients:jedis:4.4.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/selenium-container/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.13'
id 'org.springframework.boot' version '2.7.15'
}
apply plugin: 'io.spring.dependency-management'

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.3.2'
implementation 'redis.clients:jedis:4.4.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
2 changes: 1 addition & 1 deletion examples/spring-boot/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.13'
id 'org.springframework.boot' version '2.7.15'
}
apply plugin: 'io.spring.dependency-management'

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.48.0'
testImplementation 'com.azure:azure-cosmos:4.49.0'
}
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.8'
testImplementation 'com.couchbase.client:java-client:3.4.9'
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.520'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
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.9.0"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
testImplementation "org.elasticsearch.client:transport:7.17.12"
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.21.0")
testImplementation platform("com.google.cloud:libraries-bom:26.22.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
Expand Down
4 changes: 2 additions & 2 deletions modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
testImplementation("ch.qos.logback:logback-classic:1.4.8")
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")
}
Expand Down
2 changes: 1 addition & 1 deletion modules/jdbc-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api 'com.google.guava:guava:32.1.2-jre'
api 'org.apache.commons:commons-lang3:3.13.0'
api 'com.zaxxer:HikariCP-java6:2.3.13'
api 'commons-dbutils:commons-dbutils:1.7'
api 'commons-dbutils:commons-dbutils:1.8.0'

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

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.11'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
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/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.8.0'
testImplementation 'io.fabric8:kubernetes-client:6.8.1'
testImplementation 'io.kubernetes:client-java:18.0.1'
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.520")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.543")
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.117'
testImplementation 'software.amazon.awssdk:s3:2.20.139'
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.1.4'
testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.2.0'

testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
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.0.jre8-preview'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.1.jre8'

testImplementation project(':r2dbc')
testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.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.21"
api "com.orientechnologies:orientdb-client:3.2.22"

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.21"
testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
}
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.0.0'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.0.0'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
}
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.1'
testImplementation 'org.questdb:questdb:7.3.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.8'
testFixturesImplementation 'io.projectreactor:reactor-core:3.5.9'
testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
}
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:422'
testRuntimeOnly 'io.trino:trino-jdbc:425'
compileOnly 'org.jetbrains:annotations:24.0.1'
}

0 comments on commit 5cd754f

Please sign in to comment.