Skip to content

Commit

Permalink
Merge pull request #7617 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
Combined dependencies PR
  • Loading branch information
eddumelendez committed Oct 3, 2023
2 parents 375ece0 + 27b8adf commit e5916f1
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ dependencies {
}
testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:5.0.0'
testImplementation 'com.rabbitmq:amqp-client:5.18.0'
testImplementation 'com.rabbitmq:amqp-client:5.19.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.14'

testImplementation ('org.mockito:mockito-core:4.11.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:5.0.0'
implementation 'redis.clients:jedis:5.0.1'
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:5.0.0'
implementation 'redis.clients:jedis:5.0.1'
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/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,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.15"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
}
}

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:5.0.0'
implementation 'redis.clients:jedis:5.0.1'
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 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.49.0'
testImplementation 'com.azure:azure-cosmos:4.51.0'
}
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.557'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
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.23.0")
testImplementation platform("com.google.cloud:libraries-bom:26.24.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
Expand Down
2 changes: 1 addition & 1 deletion modules/hivemq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
api("org.jetbrains:annotations:24.0.1")

shaded("org.apache.commons:commons-lang3:3.13.0")
shaded("commons-io:commons-io:2.13.0")
shaded("commons-io:commons-io:2.14.0")
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")
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 @@ -8,7 +8,7 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:5.0.0'
testImplementation 'redis.clients:jedis:5.0.1'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
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')

testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.557")
testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.560")
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.154'
testImplementation 'software.amazon.awssdk:s3:2.20.157'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
2 changes: 1 addition & 1 deletion modules/oracle-xe/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'

testImplementation project(':jdbc-test')
testImplementation 'com.oracle.database.jdbc:ojdbc11:23.2.0.0'
testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'

compileOnly 'org.jetbrains:annotations:24.0.1'

Expand Down
2 changes: 1 addition & 1 deletion modules/rabbitmq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"

dependencies {
api project(":testcontainers")
testImplementation 'com.rabbitmq:amqp-client:5.18.0'
testImplementation 'com.rabbitmq:amqp-client:5.19.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
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:426'
testRuntimeOnly 'io.trino:trino-jdbc:427'
compileOnly 'org.jetbrains:annotations:24.0.1'
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
}
}
Expand Down

0 comments on commit e5916f1

Please sign in to comment.