Skip to content

Commit

Permalink
Merge pull request #5367 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed May 16, 2022
2 parents 98b60fb + eb9f540 commit 8bc0b26
Show file tree
Hide file tree
Showing 32 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.1
uses: actions/cache@v3.0.2
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.1
uses: actions/cache@v3.0.2
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.1
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
Expand All @@ -56,7 +56,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.1
uses: actions/cache@v3.0.2
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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@f1a7646cead32c950d90344a4fb5d4e926972a8f # v3.10.1
uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e # v3.10.1
with:
title: Update docs version to ${GITHUB_REF##*/}
body: |
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ dependencies {
shaded 'org.zeroturnaround:zt-exec:1.12'

testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:4.0.1'
testImplementation 'redis.clients:jedis:4.2.2'
testImplementation 'com.rabbitmq:amqp-client:5.14.2'
testImplementation 'org.mongodb:mongo-java-driver:3.12.10'

Expand Down
4 changes: 2 additions & 2 deletions examples/disque-job-queue/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.22"
annotationProcessor "org.projectlombok:lombok:1.18.20"
compileOnly "org.projectlombok:lombok:1.18.24"
annotationProcessor "org.projectlombok:lombok:1.18.24"
implementation 'biz.paluch.redis:spinach:0.3'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.guava:guava:23.0'
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 @@ -7,7 +7,7 @@ repositories {
}

dependencies {
testCompileOnly "org.projectlombok:lombok:1.18.22"
testCompileOnly "org.projectlombok:lombok:1.18.24"
testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
testImplementation 'org.testcontainers:kafka'
testImplementation 'org.apache.kafka:kafka-clients:3.1.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.32'
implementation 'redis.clients:jedis:4.2.1'
implementation 'redis.clients:jedis:4.2.2'
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.1'
implementation 'redis.clients:jedis:4.2.2'
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/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.10"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
}
}
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.1'
implementation 'redis.clients:jedis:4.2.2'
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/solr-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}

dependencies {
compileOnly "org.projectlombok:lombok:1.18.22"
compileOnly "org.projectlombok:lombok:1.18.24"
annotationProcessor "org.projectlombok:lombok:1.18.22"

implementation 'org.apache.solr:solr-solrj:8.11.1'
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,6 +1,6 @@
plugins {
id("org.springframework.boot") version "2.6.4"
id("org.jetbrains.kotlin.jvm") version "1.6.10"
id("org.jetbrains.kotlin.jvm") version "1.6.21"
id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
}

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:3.14.9'

testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'com.azure:azure-cosmos:4.26.0'
testImplementation 'com.azure:azure-cosmos:4.29.1'
}
2 changes: 1 addition & 1 deletion modules/cockroachdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dependencies {
api project(':jdbc')

testImplementation project(':jdbc-test')
testImplementation 'org.postgresql:postgresql:42.3.3'
testImplementation 'org.postgresql:postgresql:42.3.4'
}
2 changes: 1 addition & 1 deletion modules/couchbase/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:3.14.9'

testImplementation 'com.couchbase.client:java-client:3.2.6'
testImplementation 'com.couchbase.client:java-client:3.3.0'
testImplementation 'org.awaitility:awaitility:4.1.1'
}
4 changes: 2 additions & 2 deletions modules/dynalite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.169'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.210'

testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "TestContainers :: elasticsearch"
dependencies {
api project(':testcontainers')
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.16.2"
testImplementation "org.elasticsearch.client:transport:7.17.2"
testImplementation "org.elasticsearch.client:transport:7.17.3"
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.2.2'
testImplementation 'com.google.cloud:google-cloud-datastore:2.4.0'
testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.116.4'
testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.1'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.2'
testImplementation 'org.assertj:assertj-core:3.22.0'
}
2 changes: 1 addition & 1 deletion modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.7.5")
testImplementation("com.hivemq:hivemq-extension-sdk:4.8.0")
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")
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 @@ -16,5 +16,5 @@ dependencies {

api 'org.apache.tomcat:tomcat-jdbc:10.0.20'
api 'org.vibur:vibur-dbcp:25.0'
api 'mysql:mysql-connector-java:8.0.28'
api 'mysql:mysql-connector-java:8.0.29'
}
4 changes: 2 additions & 2 deletions modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:4.1.1'
testImplementation 'redis.clients:jedis:4.2.2'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:4.4.0') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'

testRuntimeOnly 'org.postgresql:postgresql:42.3.3'
testRuntimeOnly 'org.postgresql:postgresql:42.3.4'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
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 @@ -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:5.12.1'
testImplementation 'io.fabric8:kubernetes-client:5.12.2'
testImplementation 'io.kubernetes:client-java:15.0.0'
testImplementation 'org.assertj:assertj-core:3.22.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.191'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.210'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
testImplementation 'software.amazon.awssdk:s3:2.17.162'
testImplementation 'software.amazon.awssdk:s3:2.17.181'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
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:0.8.7.RELEASE'

testImplementation project(':jdbc-test')
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.1.jre8-preview'

testImplementation project(':r2dbc')
testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

testImplementation project(':jdbc-test')
testImplementation 'mysql:mysql-connector-java:8.0.28'
testImplementation 'mysql:mysql-connector-java:8.0.29'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion modules/neo4j/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ task customNeo4jPluginJar(type: Jar) {
test.dependsOn customNeo4jPluginJar

dependencies {
customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.31"
customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.32"

api project(":testcontainers")

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

testImplementation project(':jdbc-test')
testImplementation project(':test-support')
testImplementation 'org.postgresql:postgresql:42.3.3'
testImplementation 'org.postgresql:postgresql:42.3.4'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
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.12.RELEASE'
testImplementation project(':postgresql')

testFixturesImplementation 'io.projectreactor:reactor-core:3.4.16'
testFixturesImplementation 'io.projectreactor:reactor-core:3.4.17'
testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
}
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'

testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.28'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.29'

testCompileClasspath 'org.jetbrains:annotations:23.0.0'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/toxiproxy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"

dependencies {
api project(':testcontainers')
api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7'

testImplementation 'redis.clients:jedis:3.0.1'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
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')
testImplementation 'io.trino:trino-jdbc:375'
testImplementation 'io.trino:trino-jdbc:379'
compileOnly 'org.jetbrains:annotations:23.0.0'
}
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.0'
testImplementation 'io.rest-assured:rest-assured:5.0.1'
testImplementation 'org.assertj:assertj-core:3.22.0'

}

0 comments on commit 8bc0b26

Please sign in to comment.