Skip to content

Commit

Permalink
Merge pull request #4180 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rnorth authored Jun 8, 2021
2 parents ec37236 + 65f57e8 commit 9ad9e09
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
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 @@ -13,7 +13,7 @@ dependencies {
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'ch.qos.logback:logback-classic:1.2.3'
testImplementation 'org.testng:testng:7.3.0'
testImplementation 'org.testng:testng:7.4.0'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}

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,7 +1,7 @@
plugins {
id("org.springframework.boot") version "2.4.1"
id("org.jetbrains.kotlin.jvm") version "1.4.32"
id("org.jetbrains.kotlin.plugin.spring") version "1.5.0"
id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
}

apply plugin: 'io.spring.dependency-management'
Expand Down
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 {
compile project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1018'
testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'
testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.1030'

testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
testCompile 'org.assertj:assertj-core:3.16.1'
testCompile 'org.assertj:assertj-core:3.19.0'
}
4 changes: 2 additions & 2 deletions modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description = "Testcontainers :: Localstack"
dependencies {
compile project(':testcontainers')

compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.930'
testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.929'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.1018'
testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
testCompile 'software.amazon.awssdk:s3:2.16.62'
Expand Down
2 changes: 1 addition & 1 deletion modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ dependencies {
testCompile testFixtures(project(':r2dbc'))
testCompile 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'

compileOnly 'org.jetbrains:annotations:20.1.0'
compileOnly 'org.jetbrains:annotations:21.0.1'
}
2 changes: 1 addition & 1 deletion modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
testRuntime 'org.postgresql:postgresql:42.2.18'
testRuntime 'mysql:mysql-connector-java:8.0.25'

testCompileClasspath 'org.jetbrains:annotations:20.1.0'
testCompileClasspath 'org.jetbrains:annotations:21.0.1'
}

sourceJar {
Expand Down
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 {
compile project(':testcontainers')

testCompile 'com.bettercloud:vault-java-driver:5.1.0'
testCompile 'io.rest-assured:rest-assured:4.3.3'
testCompile 'io.rest-assured:rest-assured:4.4.0'
testCompile 'org.assertj:assertj-core:3.19.0'

}

0 comments on commit 9ad9e09

Please sign in to comment.