Skip to content

Commit

Permalink
Merge pull request #4352 from testcontainers/combined-pr-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rnorth authored Aug 2, 2021
2 parents 289521d + d94acf0 commit 8fe1c3c
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ configurations.all {
}

dependencies {
baseline 'org.testcontainers:testcontainers:1.15.3', {
baseline 'org.testcontainers:testcontainers:1.16.0', {
exclude group: "*", module: "*"
}

api 'junit:junit:4.12'
api 'org.slf4j:slf4j-api:1.7.30'
api 'org.slf4j:slf4j-api:1.7.32'
compileOnly 'org.jetbrains:annotations:21.0.1'
testCompileClasspath 'org.jetbrains:annotations:21.0.1'
api 'org.apache.commons:commons-compress:1.20'
Expand Down Expand Up @@ -138,9 +138,9 @@ dependencies {
}

testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
testImplementation 'redis.clients:jedis:3.6.1'
testImplementation 'redis.clients:jedis:3.6.3'
testImplementation 'com.rabbitmq:amqp-client:5.12.0'
testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
testImplementation 'org.mongodb:mongo-java-driver:3.12.9'

testImplementation ('org.mockito:mockito-core:3.11.2') {
exclude(module: 'hamcrest-core')
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 {
jcenter()
}
dependencies {
compileOnly 'org.slf4j:slf4j-api:1.7.30'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'org.json:json:20210307'
testImplementation 'org.postgresql:postgresql:42.2.22'
testImplementation 'org.postgresql:postgresql:42.2.23'
testImplementation 'ch.qos.logback:logback-classic:1.2.3'
testImplementation 'org.testcontainers:postgresql'
}
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.30'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'redis.clients:jedis:3.6.1'
implementation 'com.google.code.gson:gson:2.8.7'
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.30'
compileOnly 'org.slf4j:slf4j-api:1.7.32'
implementation 'redis.clients:jedis:3.6.1'
implementation 'com.google.code.gson:gson:2.8.7'
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:3.6.1'
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'com.google.guava:guava:23.0'
compileOnly 'org.slf4j:slf4j-api:1.7.30'
compileOnly 'org.slf4j:slf4j-api:1.7.32'

testImplementation 'ch.qos.logback:logback-classic:1.2.3'
testImplementation 'org.testcontainers:testcontainers'
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.5.2"
id("org.jetbrains.kotlin.jvm") version "1.5.10"
id("org.jetbrains.kotlin.plugin.spring") version "1.5.20"
id("org.jetbrains.kotlin.plugin.spring") version "1.5.21"
}

apply plugin: 'io.spring.dependency-management'
Expand Down
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
dependencies {
api project(':testcontainers')

testImplementation 'com.couchbase.client:java-client:3.1.6'
testImplementation 'com.couchbase.client:java-client:3.2.0'
testImplementation 'org.awaitility:awaitility:4.1.0'
}
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.13.0"
testImplementation "org.elasticsearch.client:transport:7.13.2"
testImplementation "org.elasticsearch.client:transport:7.13.4"
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/jdbc-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies {

api 'org.apache.tomcat:tomcat-jdbc:10.0.7'
api 'org.vibur:vibur-dbcp:25.0'
api 'mysql:mysql-connector-java:8.0.25'
api 'mysql:mysql-connector-java:8.0.26'
}
4 changes: 2 additions & 2 deletions modules/junit-jupiter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')
testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'redis.clients:jedis:3.6.1'
testImplementation 'redis.clients:jedis:3.6.3'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
testImplementation ('org.mockito:mockito-core:3.11.2') {
exclude(module: 'hamcrest-core')
Expand All @@ -16,7 +16,7 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'

testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
}

Expand Down
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.16'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.37'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37'
testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.19'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.37'
testImplementation 'software.amazon.awssdk:s3:2.16.97'
testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
}
2 changes: 1 addition & 1 deletion modules/mysql/build.gradle
Original file line number Diff line number Diff line change
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.25'
testImplementation 'mysql:mysql-connector-java:8.0.26'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion modules/postgresql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {

testImplementation project(':jdbc-test')
testImplementation project(':test-support')
testImplementation 'org.postgresql:postgresql:42.2.22'
testImplementation 'org.postgresql:postgresql:42.2.23'

testImplementation testFixtures(project(':r2dbc'))
testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
Expand Down
4 changes: 2 additions & 2 deletions modules/spock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ dependencies {
testImplementation project(':mysql')
testImplementation project(':postgresql')

testImplementation 'com.zaxxer:HikariCP:4.0.3'
testImplementation 'com.zaxxer:HikariCP:5.0.0'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'

testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'

testCompileClasspath 'org.jetbrains:annotations:21.0.1'
Expand Down

0 comments on commit 8fe1c3c

Please sign in to comment.