Skip to content

Commit

Permalink
Merge pull request #5816 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez authored Sep 2, 2022
2 parents fc3d600 + a4581a6 commit 47837f2
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 28 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/[email protected].7
uses: actions/[email protected].8
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/[email protected].7
uses: actions/[email protected].8
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/[email protected].7
uses: actions/[email protected].8
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/[email protected].7
uses: actions/[email protected].8
continue-on-error: true
with:
path: ~/.gradle/caches
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ configurations.all {

dependencies {
api 'junit:junit:4.13.2'
api 'org.slf4j:slf4j-api:1.7.36'
api 'org.slf4j:slf4j-api:2.0.0'
compileOnly 'org.jetbrains:annotations:23.0.0'
testCompileClasspath 'org.jetbrains:annotations:23.0.0'
api 'org.apache.commons:commons-compress:1.21'
Expand All @@ -80,7 +80,7 @@ dependencies {

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

shaded "org.yaml:snakeyaml:1.30"
shaded "org.yaml:snakeyaml:1.31"

shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

Expand Down
4 changes: 2 additions & 2 deletions examples/linked-container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ repositories {
mavenCentral()
}
dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.slf4j:slf4j-api:2.0.0'
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'org.json:json:20220320'
testImplementation 'org.postgresql:postgresql:42.4.2'
testImplementation 'org.postgresql:postgresql:42.5.0'
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repositories {
}

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.slf4j:slf4j-api:2.0.0'
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'com.google.guava:guava:23.0'
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 @@ -7,7 +7,7 @@ repositories {
}

dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.slf4j:slf4j-api:2.0.0'
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'com.google.guava:guava:23.0'
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 @@ -11,7 +11,7 @@ dependencies {
implementation 'redis.clients:jedis:4.2.3'
implementation 'com.google.code.gson:gson:2.9.1'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.36'
compileOnly 'org.slf4j:slf4j-api:2.0.0'

testImplementation 'ch.qos.logback:logback-classic:1.2.11'
testImplementation 'org.testcontainers:testcontainers'
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.10.0'

testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.azure:azure-cosmos:4.34.0'
testImplementation 'com.azure:azure-cosmos:4.35.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.2'
testImplementation 'org.postgresql:postgresql:42.5.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
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"
dependencies {
api project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.285'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
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:8.3.3"
testImplementation "org.elasticsearch.client:transport:7.17.5"
testImplementation "org.elasticsearch.client:transport:7.17.6"
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.11.0'
testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
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 @@ -16,7 +16,7 @@ dependencies {
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")
testImplementation("ch.qos.logback:logback-classic:1.4.0")
testImplementation 'org.assertj:assertj-core:3.23.1'
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
}
Expand Down
2 changes: 1 addition & 1 deletion modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'

testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.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.0.0'
testImplementation 'io.fabric8:kubernetes-client:6.1.1'
testImplementation 'io.kubernetes:client-java:16.0.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
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.285'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
testImplementation 'software.amazon.awssdk:s3:2.17.256'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
6 changes: 3 additions & 3 deletions modules/postgresql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ dependencies {
api project(':jdbc')

compileOnly project(':r2dbc')
compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

testImplementation project(':jdbc-test')
testImplementation project(':test-support')
testImplementation 'org.postgresql:postgresql:42.4.2'
testImplementation 'org.postgresql:postgresql:42.5.0'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'

compileOnly 'org.jetbrains:annotations:23.0.0'
}
2 changes: 1 addition & 1 deletion modules/r2dbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'

testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
testImplementation project(':postgresql')

testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
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:393'
testImplementation 'io.trino:trino-jdbc:394'
compileOnly 'org.jetbrains:annotations:23.0.0'
}

0 comments on commit 47837f2

Please sign in to comment.