Skip to content

Commit

Permalink
Merge pull request #4448 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rnorth authored Sep 7, 2021
2 parents 475e619 + be7eb84 commit 8464651
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ dependencies {

api 'junit:junit:4.12'
api 'org.slf4j:slf4j-api:1.7.32'
compileOnly 'org.jetbrains:annotations:21.0.1'
compileOnly 'org.jetbrains:annotations:22.0.0'
testCompileClasspath 'org.jetbrains:annotations:21.0.1'
api 'org.apache.commons:commons-compress:1.21'
api ('org.rnorth.duct-tape:duct-tape:1.0.8') {
Expand Down Expand Up @@ -106,7 +106,7 @@ dependencies {

testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:3.7.0'
testImplementation 'com.rabbitmq:amqp-client:5.12.0'
testImplementation 'com.rabbitmq:amqp-client:5.13.1'
testImplementation 'org.mongodb:mongo-java-driver:3.12.10'

testImplementation ('org.mockito:mockito-core:3.12.4') {
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:6.9.1'
testImplementation 'io.cucumber:cucumber-java:6.11.0'
testImplementation 'io.cucumber:cucumber-junit:6.11.0'
testImplementation 'org.testcontainers:selenium'
}
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.32'
implementation 'redis.clients:jedis:3.6.1'
implementation 'redis.clients:jedis:3.7.0'
implementation 'com.google.code.gson:gson:2.8.8'
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.32'
implementation 'redis.clients:jedis:3.6.1'
implementation 'redis.clients:jedis:3.7.0'
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'com.google.guava:guava:23.0'
testImplementation 'org.testcontainers:testcontainers'
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:3.6.1'
implementation 'redis.clients:jedis:3.7.0'
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
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,6 +1,6 @@
plugins {
id("org.springframework.boot") version "2.5.4"
id("org.jetbrains.kotlin.jvm") version "1.5.10"
id("org.jetbrains.kotlin.jvm") version "1.5.30"
id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"
}

Expand Down
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:7.14.1"
testImplementation "org.elasticsearch.client:transport:7.13.4"
testImplementation "org.elasticsearch.client:transport:7.14.1"
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
6 changes: 3 additions & 3 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.37'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.62'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.37'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.62'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
testImplementation 'software.amazon.awssdk:s3:2.17.9'
testImplementation 'software.amazon.awssdk:s3:2.17.34'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
4 changes: 2 additions & 2 deletions modules/mssqlserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ dependencies {
compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'

testImplementation project(':jdbc-test')
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'

testImplementation project(':r2dbc')
testImplementation 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'

// MSSQL's wait strategy requires the JDBC driver
testImplementation testFixtures(project(':r2dbc'))
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.3.1.jre8-preview'
testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
}

0 comments on commit 8464651

Please sign in to comment.