Skip to content

Commit

Permalink
Merge pull request #6113 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Nov 2, 2022
2 parents 8fe5901 + 3643c0a commit 986b037
Show file tree
Hide file tree
Showing 40 changed files with 52 additions and 52 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-examples.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.9
uses: actions/cache@v3.0.11
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.9
uses: actions/cache@v3.0.11
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.9
uses: actions/cache@v3.0.11
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
Expand All @@ -51,7 +51,7 @@ jobs:
java-version: '8.0.302'
distribution: temurin
- name: Cache Gradle Home files
uses: actions/cache@v3.0.9
uses: actions/cache@v3.0.11
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Expand Up @@ -18,6 +18,6 @@ jobs:
if: github.repository == 'testcontainers/testcontainers-java'
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@df69d584deac33d8569990cb6413f82447181076 # v5.19.0
- uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb # v5.19.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Expand Up @@ -23,4 +23,4 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
labels: dependencies

- uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # v1.0.3
- uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1.0.3
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -125,7 +125,7 @@ subprojects {
}

dependencies {
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
}

checkstyle {
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle
Expand Up @@ -64,7 +64,7 @@ dependencies {
api 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.jetbrains:annotations:23.0.0'
testCompileOnly 'org.jetbrains:annotations:23.0.0'
api 'org.apache.commons:commons-compress:1.21'
api 'org.apache.commons:commons-compress:1.22'
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
exclude(group: 'org.jetbrains', module: 'annotations')
}
Expand All @@ -91,7 +91,7 @@ dependencies {
testImplementation 'com.rabbitmq:amqp-client:5.16.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.11'

testImplementation ('org.mockito:mockito-core:4.8.0') {
testImplementation ('org.mockito:mockito-core:4.8.1') {
exclude(module: 'hamcrest-core')
}
// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/junit4/generic/build.gradle
Expand Up @@ -6,7 +6,7 @@ dependencies {
testImplementation project(":selenium")
testImplementation project(":mysql")

testImplementation 'mysql:mysql-connector-java:8.0.21'
testImplementation 'mysql:mysql-connector-java:8.0.31'
testImplementation "org.seleniumhq.selenium:selenium-api:3.141.59"
testImplementation 'org.assertj:assertj-core:3.15.0'
}
2 changes: 1 addition & 1 deletion docs/examples/junit5/redis/build.gradle
Expand Up @@ -4,7 +4,7 @@ dependencies {
api "io.lettuce:lettuce-core:5.1.1.RELEASE"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
testImplementation project(":testcontainers")
testImplementation project(":junit-jupiter")
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/spock/redis/build.gradle
Expand Up @@ -7,5 +7,5 @@ dependencies {
api "io.lettuce:lettuce-core:5.2.0.RELEASE"
testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
testImplementation project(":spock")
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
}
2 changes: 1 addition & 1 deletion examples/cucumber/build.gradle
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.8.0'
testImplementation 'io.cucumber:cucumber-java:7.9.0'
testImplementation 'io.cucumber:cucumber-junit:7.8.0'
testImplementation 'org.testcontainers:selenium'
testImplementation 'org.assertj:assertj-core:3.23.1'
Expand Down
4 changes: 2 additions & 2 deletions examples/kafka-cluster/build.gradle
Expand Up @@ -10,8 +10,8 @@ dependencies {
testCompileOnly "org.projectlombok:lombok:1.18.24"
testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
testImplementation 'org.testcontainers:kafka'
testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
}
2 changes: 1 addition & 1 deletion examples/linked-container/build.gradle
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'org.json:json:20220924'
testImplementation 'org.postgresql:postgresql:42.5.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache-testng/build.gradle
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
testImplementation 'org.testng:testng:7.5'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-backed-cache/build.gradle
Expand Up @@ -13,6 +13,6 @@ dependencies {
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'junit:junit:4.13.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion examples/singleton-container/build.gradle
Expand Up @@ -13,7 +13,7 @@ dependencies {
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.36'

testImplementation 'ch.qos.logback:logback-classic:1.3.3'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion examples/solr-container/build.gradle
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly "org.projectlombok:lombok:1.18.24"
annotationProcessor "org.projectlombok:lombok:1.18.24"

implementation 'org.apache.solr:solr-solrj:8.11.1'
implementation 'org.apache.solr:solr-solrj:8.11.2'

testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:solr'
Expand Down
2 changes: 1 addition & 1 deletion examples/zookeeper/build.gradle
Expand Up @@ -10,5 +10,5 @@ dependencies {
testImplementation 'org.apache.curator:curator-framework:5.3.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
testImplementation 'ch.qos.logback:logback-classic:1.3.4'
}
2 changes: 1 addition & 1 deletion modules/azure/build.gradle
Expand Up @@ -6,5 +6,5 @@ dependencies {
shaded 'com.squareup.okhttp3:okhttp:4.10.0'

testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.azure:azure-cosmos:4.37.0'
testImplementation 'com.azure:azure-cosmos:4.38.1'
}
2 changes: 1 addition & 1 deletion modules/cassandra/build.gradle
Expand Up @@ -2,7 +2,7 @@ description = "TestContainers :: Cassandra"

configurations.all {
resolutionStrategy {
force 'io.dropwizard.metrics:metrics-core:3.2.4'
force 'io.dropwizard.metrics:metrics-core:3.2.6'
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/db2/build.gradle
Expand Up @@ -4,6 +4,6 @@ dependencies {
api project(':jdbc')

testImplementation project(':jdbc-test')
testImplementation 'com.ibm.db2:jcc:11.5.7.0'
testImplementation 'com.ibm.db2:jcc:11.5.8.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/dynalite/build.gradle
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.333'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/elasticsearch/build.gradle
Expand Up @@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"

dependencies {
api project(':testcontainers')
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.2"
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.5.0"
testImplementation "org.elasticsearch.client:transport:7.17.6"
testImplementation 'org.assertj:assertj-core:3.23.1'
}
6 changes: 3 additions & 3 deletions modules/gcloud/build.gradle
Expand Up @@ -3,10 +3,10 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')

testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.13.0'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
4 changes: 2 additions & 2 deletions modules/hivemq/build.gradle
Expand Up @@ -6,7 +6,7 @@ dependencies {

shaded("org.apache.commons:commons-lang3:3.12.0")
shaded("commons-io:commons-io:2.11.0")
shaded("org.javassist:javassist:3.29.0-GA")
shaded("org.javassist:javassist:3.29.2-GA")
shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
shaded("net.lingala.zip4j:zip4j:2.11.2")
Expand All @@ -16,7 +16,7 @@ dependencies {
testImplementation("com.hivemq:hivemq-extension-sdk:4.9.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.4.3")
testImplementation("ch.qos.logback:logback-classic:1.4.4")
testImplementation 'org.assertj:assertj-core:3.23.1'
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
}
Expand Down
2 changes: 1 addition & 1 deletion modules/jdbc-test/build.gradle
Expand Up @@ -11,7 +11,7 @@ dependencies {

api 'org.assertj:assertj-core:3.23.1'

api 'org.apache.tomcat:tomcat-jdbc:10.0.23'
api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
api 'org.vibur:vibur-dbcp:25.0'
api 'mysql:mysql-connector-java:8.0.30'
}
4 changes: 2 additions & 2 deletions modules/jdbc/build.gradle
Expand Up @@ -7,10 +7,10 @@ dependencies {
compileOnly 'org.jetbrains:annotations:23.0.0'
testImplementation 'commons-dbutils:commons-dbutils:1.7'
testImplementation 'org.vibur:vibur-dbcp:25.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.0'
testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.1'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation ('org.mockito:mockito-core:4.8.0') {
testImplementation ('org.mockito:mockito-core:4.8.1') {
exclude(module: 'hamcrest-core')
}
}
6 changes: 3 additions & 3 deletions modules/junit-jupiter/build.gradle
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.3'
testImplementation 'redis.clients:jedis:4.3.1'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:4.8.0') {
testImplementation ('org.mockito:mockito-core:4.8.1') {
exclude(module: 'hamcrest-core')
}
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'

testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
}

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

testImplementation 'io.fabric8:kubernetes-client:6.1.1'
testImplementation 'io.kubernetes:client-java:16.0.0'
testImplementation 'io.kubernetes:client-java:16.0.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/kafka/build.gradle
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
dependencies {
api project(':testcontainers')

testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.google.guava:guava:23.0'
}
6 changes: 3 additions & 3 deletions modules/localstack/build.gradle
Expand Up @@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.314'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
testImplementation 'software.amazon.awssdk:s3:2.17.285'
testImplementation 'software.amazon.awssdk:s3:2.18.7'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/mongodb/build.gradle
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MongoDB"
dependencies {
api project(':testcontainers')

testImplementation("org.mongodb:mongodb-driver-sync:4.7.1")
testImplementation("org.mongodb:mongodb-driver-sync:4.7.2")
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/mysql/build.gradle
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.30'
testImplementation 'mysql:mysql-connector-java:8.0.31'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion modules/pulsar/build.gradle
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
dependencies {
api project(':testcontainers')

testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.1'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.2'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.1'
}
2 changes: 1 addition & 1 deletion modules/questdb/build.gradle
Expand Up @@ -7,7 +7,7 @@ dependencies {
testImplementation 'org.postgresql:postgresql:42.5.0'
testImplementation project(':jdbc-test')
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.questdb:questdb:6.4.3-jdk8'
testImplementation 'org.questdb:questdb:6.5.4-jdk8'
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
}
2 changes: 1 addition & 1 deletion modules/r2dbc/build.gradle
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.4.23'
testFixturesImplementation 'io.projectreactor:reactor-core:3.4.24'
testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/solr/build.gradle
Expand Up @@ -5,6 +5,6 @@ dependencies {
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.10.0'

testImplementation 'org.apache.solr:solr-solrj:8.11.1'
testImplementation 'org.apache.solr:solr-solrj:8.11.2'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Expand Up @@ -16,7 +16,7 @@ dependencies {
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'

testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'

testCompileOnly 'org.jetbrains:annotations:23.0.0'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/tidb/build.gradle
Expand Up @@ -4,7 +4,7 @@ dependencies {
api project(':jdbc')

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

compileOnly 'org.jetbrains:annotations:23.0.0'
}
2 changes: 1 addition & 1 deletion modules/trino/build.gradle
Expand Up @@ -4,6 +4,6 @@ dependencies {
api project(':jdbc')

testImplementation project(':jdbc-test')
testImplementation 'io.trino:trino-jdbc:398'
testImplementation 'io.trino:trino-jdbc:401'
compileOnly 'org.jetbrains:annotations:23.0.0'
}

0 comments on commit 986b037

Please sign in to comment.