Merge branch 'master' into master

raynigon · Aug 5, 2020 · be98c6b · be98c6b
2 parents 3ddb393 + 0c69b44
commit be98c6b
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
@@ -31,7 +31,7 @@ jobs:
           sleep 1
           DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock docker info || ls -la $XDG_RUNTIME_DIR
       - name: Build with Gradle
-        run: ./gradlew --no-daemon --scan testcontainers:test
+        run: ./gradlew --no-daemon --scan testcontainers:test --tests '*GenericContainerRuleTest'
       - name: aggregate test reports with ciMate
         if: always()
         continue-on-error: true

diff --git a/core/build.gradle b/core/build.gradle
@@ -202,9 +202,9 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
     testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.12.5'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.6'
 
-    testCompile ('org.mockito:mockito-core:3.3.3') {
+    testCompile ('org.mockito:mockito-core:3.4.6') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

diff --git a/core/src/test/resources/health-wait-strategy-dockerfile/write_file_and_loop.sh b/core/src/test/resources/health-wait-strategy-dockerfile/write_file_and_loop.sh
@@ -1,8 +1,8 @@
 #!/bin/ash
 
-echo sleeping
+set -ex
+
 sleep 2
-echo writing file
 touch /testfile
 
 while true; do sleep 1; done
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -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.1.1'
-    testImplementation 'io.cucumber:cucumber-junit:6.1.1'
+    testImplementation 'io.cucumber:cucumber-java:6.2.2'
+    testImplementation 'io.cucumber:cucumber-junit:6.2.2'
     testImplementation 'org.testcontainers:selenium'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
     implementation 'org.json:json:20180813'
     testImplementation 'org.postgresql:postgresql:42.2.14'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'

diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.1.RELEASE'
+    id 'org.springframework.boot' version '2.3.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.1.RELEASE'
+    id 'org.springframework.boot' version '2.3.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.816'
-    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.812'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.827'
+    testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.827'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     compile project(':test-support')
 
     compile 'com.google.guava:guava:29.0-jre'
-    compile 'org.apache.commons:commons-lang3:3.10'
+    compile 'org.apache.commons:commons-lang3:3.11'
     compile 'com.zaxxer:HikariCP-java6:2.3.13'
     compile 'commons-dbutils:commons-dbutils:1.7'
 
@@ -17,5 +17,5 @@ dependencies {
     compile 'commons-dbutils:commons-dbutils:1.7'
     compile 'org.apache.tomcat:tomcat-jdbc:9.0.37'
     compile 'org.vibur:vibur-dbcp:25.0'
-    compile 'mysql:mysql-connector-java:8.0.20'
+    compile 'mysql:mysql-connector-java:8.0.21'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -9,14 +9,14 @@ dependencies {
     testCompile 'com.zaxxer:HikariCP:3.4.5'
     testCompile 'redis.clients:jedis:3.3.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
-    testCompile ('org.mockito:mockito-core:3.3.3') {
+    testCompile ('org.mockito:mockito-core:3.4.4') {
         exclude(module: 'hamcrest-core')
     }
     testCompile 'org.assertj:assertj-core:3.16.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.6.2'
 
     testRuntime 'org.postgresql:postgresql:42.2.14'
-    testRuntime 'mysql:mysql-connector-java:8.0.20'
+    testRuntime 'mysql:mysql-connector-java:8.0.21'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
 }
 

diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: Localstack"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.816'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.831'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.816'
-    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.812'
+    testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.831'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
-    testCompile 'software.amazon.awssdk:s3:2.13.50'
+    testCompile 'software.amazon.awssdk:s3:2.13.61'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -7,11 +7,11 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.2-alpha2'
+    compileOnly 'org.mariadb:r2dbc-mariadb:0.8.3-beta1'
 
     testCompile project(':jdbc-test')
-    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.1'
+    testCompile 'org.mariadb.jdbc:mariadb-java-client:2.6.2'
 
     testCompile testFixtures(project(':r2dbc'))
-    testCompile 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1'
+    testCompile 'org.mariadb:r2dbc-mariadb:0.8.3-beta1'
 }
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.3.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.4.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:8.3.1.jre8-preview'

diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -7,10 +7,10 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'
+    compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     testCompile project(':jdbc-test')
-    testCompile 'mysql:mysql-connector-java:8.0.20'
+    testCompile 'mysql:mysql-connector-java:8.0.21'
 
     testCompile testFixtures(project(':r2dbc'))
     testCompile 'dev.miku:r2dbc-mysql:0.8.1.RELEASE'

diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.3.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.4.RELEASE'
 
     testCompile project(':jdbc-test')
     testCompile project(':test-support')

diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testCompile 'org.apache.httpcomponents:httpclient:4.5.12'
 
     testRuntime 'org.postgresql:postgresql:42.2.14'
-    testRuntime 'mysql:mysql-connector-java:8.0.20'
+    testRuntime 'mysql:mysql-connector-java:8.0.21'
 }
 
 sourceJar {