Skip to content

Commit

Permalink
Merge pull request #5730 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Aug 16, 2022
2 parents 625947f + 22be16e commit fdb11ec
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.7
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.7
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 @@ -33,7 +33,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.7
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
Expand All @@ -59,7 +59,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.7
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ dependencies {
testImplementation 'com.rabbitmq:amqp-client:5.15.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.11'

testImplementation ('org.mockito:mockito-core:4.6.1') {
testImplementation ('org.mockito:mockito-core:4.7.0') {
exclude(module: 'hamcrest-core')
}
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
Expand Down
2 changes: 1 addition & 1 deletion examples/cucumber/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'
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.5.0'
testImplementation 'io.cucumber:cucumber-java:7.6.0'
testImplementation 'io.cucumber:cucumber-junit:7.5.0'
testImplementation 'org.testcontainers:selenium'
}
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.10.3"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.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 @@ -6,5 +6,5 @@ dependencies {
shaded 'com.squareup.okhttp3:okhttp:3.14.9'

testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.azure:azure-cosmos:4.33.1'
testImplementation 'com.azure:azure-cosmos:4.34.0'
}
2 changes: 1 addition & 1 deletion modules/cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ configurations.all {
dependencies {
api project(":database-commons")
api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
testImplementation 'com.datastax.oss:java-driver-core:4.8.0'
testImplementation 'com.datastax.oss:java-driver-core:4.14.1'
}
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')
testImplementation 'org.postgresql:postgresql:42.4.0'
testImplementation 'org.postgresql:postgresql:42.4.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/consul/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies {

testImplementation 'com.ecwid.consul:consul-api:1.4.5'
testImplementation 'io.rest-assured:rest-assured:4.4.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
4 changes: 2 additions & 2 deletions modules/gcloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies {
api project(':testcontainers')

testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
testImplementation 'com.google.cloud:google-cloud-firestore:3.3.0'
testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
testImplementation 'com.google.cloud:google-cloud-spanner:6.27.0'
testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
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 @@ -13,7 +13,7 @@ dependencies {

testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
testImplementation(project(":junit-jupiter"))
testImplementation("com.hivemq:hivemq-extension-sdk:4.8.2")
testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
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.11")
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 @@ -9,13 +9,13 @@ dependencies {
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:4.2.3'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:4.6.1') {
testImplementation ('org.mockito:mockito-core:4.7.0') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'

testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
}
Expand Down
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')

compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.273'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.281'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.273'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
testImplementation 'software.amazon.awssdk:s3:2.17.244'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
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) {
processTestResources.dependsOn customNeo4jPluginJar

dependencies {
customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.34"
customNeo4jPluginCompileOnly "org.neo4j:neo4j:3.5.35"

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.4.0'
testImplementation 'org.postgresql:postgresql:42.4.1'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'

testRuntimeOnly 'org.postgresql:postgresql:42.4.0'
testRuntimeOnly 'org.postgresql:postgresql:42.4.1'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'

testCompileClasspath 'org.jetbrains:annotations:23.0.0'
Expand Down
2 changes: 1 addition & 1 deletion modules/tidb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':jdbc')

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

compileOnly 'org.jetbrains:annotations:23.0.0'
}
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:391'
testImplementation 'io.trino:trino-jdbc:392'
compileOnly 'org.jetbrains:annotations:23.0.0'
}
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.3"
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
}
}
Expand Down

0 comments on commit fdb11ec

Please sign in to comment.