From 32c05bd88f120d1b9225f01ed683febd82df0b50 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 28 Jul 2020 13:44:05 +0200 Subject: [PATCH 01/23] limit to a subset of rootless tests --- .github/workflows/ci-rootless.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml index 7dacc2767a5..bf1fe08bbd2 100644 --- 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 From d50d01bd3a86c5540ea44515b0b1e2722e1283c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:25:10 +0100 Subject: [PATCH 02/23] Bump cucumber-java from 6.1.1 to 6.2.2 in /examples (#3040) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- examples/cucumber/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle index d17837f1518..0ea976800a6 100644 --- 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-java:6.2.2' testImplementation 'io.cucumber:cucumber-junit:6.1.1' testImplementation 'org.testcontainers:selenium' } From 23f310c0aa41f2f5d836d44f4dab892c9e1508d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:05:06 +0100 Subject: [PATCH 03/23] Bump cucumber-junit from 6.1.1 to 6.2.2 in /examples (#3041) Bumps [cucumber-junit](https://github.com/cucumber/cucumber-jvm) from 6.1.1 to 6.2.2. - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v6.1.1...v6.2.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/cucumber/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle index 0ea976800a6..ae211cedc04 100644 --- a/examples/cucumber/build.gradle +++ b/examples/cucumber/build.gradle @@ -11,6 +11,6 @@ dependencies { 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.2.2' - testImplementation 'io.cucumber:cucumber-junit:6.1.1' + testImplementation 'io.cucumber:cucumber-junit:6.2.2' testImplementation 'org.testcontainers:selenium' } From 6aa2c567229c05ffaeedb478e13019442cbd8c55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:06:38 +0100 Subject: [PATCH 04/23] Bump commons-lang3 from 3.10 to 3.11 in /modules/jdbc-test (#3043) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/jdbc-test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle index 0c06ad083e0..f19970c9380 100644 --- 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' From 95ac56c15524c17c4103ceee44b4b23849d08366 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:07:19 +0100 Subject: [PATCH 05/23] Bump s3 from 2.13.50 to 2.13.61 in /modules/localstack (#3028) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/localstack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 6e9e44af320..3ce019b0549 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -7,5 +7,5 @@ dependencies { 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-logs:1.11.807' - testCompile 'software.amazon.awssdk:s3:2.13.50' + testCompile 'software.amazon.awssdk:s3:2.13.61' } From a0ac5449efaeed0bc62143d0a52ef472e2c6b0ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:13:00 +0100 Subject: [PATCH 06/23] Bump okhttp from 4.7.2 to 4.8.0 in /examples (#3042) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- examples/linked-container/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle index f56b8bc46d8..75bc7f3b0e8 100644 --- 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' From 10dbdd98bed6c67989de277e4093eb219396169a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:38:56 +0100 Subject: [PATCH 07/23] Bump r2dbc-mssql from 0.8.3.RELEASE to 0.8.4.RELEASE in /modules/mssqlserver (#3033) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/mssqlserver/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle index d9e01fe3a57..508de84a2f9 100644 --- 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' From 2056268178db93a66e16449f2afd62e4e0cd104b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:46:18 +0100 Subject: [PATCH 08/23] Bump mysql-connector-java from 8.0.20 to 8.0.21 in /modules/spock (#3032) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/spock/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle index ee4ac56053f..1a9eddf4ffc 100644 --- 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 { From ed6b1175e0c3780ed4acaccc22bf7f71800a735c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:46:34 +0100 Subject: [PATCH 09/23] Bump r2dbc-postgresql from 0.8.3.RELEASE to 0.8.4.RELEASE in /modules/postgresql (#3035) Bumps [r2dbc-postgresql](https://github.com/r2dbc/r2dbc-postgresql) from 0.8.3.RELEASE to 0.8.4.RELEASE. - [Release notes](https://github.com/r2dbc/r2dbc-postgresql/releases) - [Changelog](https://github.com/pgjdbc/r2dbc-postgresql/blob/v0.8.4.RELEASE/CHANGELOG) - [Commits](https://github.com/r2dbc/r2dbc-postgresql/compare/v0.8.3.RELEASE...v0.8.4.RELEASE) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/postgresql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle index 7e6adea9cf1..8f30490eeb8 100644 --- 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') From d12d337e64e4dc4a76da5d04a0fe94547837155b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:46:46 +0100 Subject: [PATCH 10/23] Bump mariadb-java-client from 2.6.1 to 2.6.2 in /modules/mariadb (#3034) Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md) - [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.1...2.6.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/mariadb/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle index a4f2f951233..775854748dc 100644 --- a/modules/mariadb/build.gradle +++ b/modules/mariadb/build.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly 'org.mariadb:r2dbc-mariadb:0.8.2-alpha2' 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' From 0f0eaee72b5ae6971e441549bbdb117f91be9d3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:47:04 +0100 Subject: [PATCH 11/23] Bump r2dbc-mariadb from 0.8.2-alpha2 to 0.8.3-beta1 in /modules/mariadb (#3036) Bumps [r2dbc-mariadb](https://github.com/mariadb-corporation/mariadb-connector-r2dbc) from 0.8.2-alpha2 to 0.8.3-beta1. - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/mariadb/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle index 775854748dc..94164468855 100644 --- 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.2' testCompile testFixtures(project(':r2dbc')) - testCompile 'org.mariadb:r2dbc-mariadb:0.8.1-alpha1' + testCompile 'org.mariadb:r2dbc-mariadb:0.8.3-beta1' } From 495a7309ba2f20d76e3265176dfe9d6696238558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:47:16 +0100 Subject: [PATCH 12/23] Bump mysql-connector-java from 8.0.20 to 8.0.21 in /modules/junit-jupiter (#3037) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.20 to 8.0.21. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.20...8.0.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/junit-jupiter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle index ffc060d8b01..aedffacfc58 100644 --- a/modules/junit-jupiter/build.gradle +++ b/modules/junit-jupiter/build.gradle @@ -16,7 +16,7 @@ dependencies { 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' } From b87f9930d83738880eda5674237ae88d44ffbf5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:47:46 +0100 Subject: [PATCH 13/23] Bump org.springframework.boot from 2.3.1.RELEASE to 2.3.2.RELEASE in /examples (#3039) Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.3.1.RELEASE to 2.3.2.RELEASE. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.3.1.RELEASE...v2.3.2.RELEASE) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- examples/selenium-container/build.gradle | 2 +- examples/spring-boot/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle index dc59ca877ab..e8a7861a7d9 100644 --- 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 index 060a7f48357..4821f0921e3 100644 --- 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' From eb7d15e2ff665f062333e28d839d6ce412f0c735 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:47:55 +0100 Subject: [PATCH 14/23] Bump mockito-core from 3.3.3 to 3.4.4 in /modules/junit-jupiter (#3038) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/junit-jupiter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle index aedffacfc58..05ad7d34930 100644 --- a/modules/junit-jupiter/build.gradle +++ b/modules/junit-jupiter/build.gradle @@ -9,7 +9,7 @@ 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' From 97f738ee3b85b43f7d3d3639140df9f18e9f0cdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:48:14 +0100 Subject: [PATCH 15/23] Bump mysql-connector-java from 8.0.20 to 8.0.21 in /modules/mysql (#3045) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.20 to 8.0.21. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.20...8.0.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/mysql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle index c9c165cc874..bf96ab89536 100644 --- a/modules/mysql/build.gradle +++ b/modules/mysql/build.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly 'dev.miku:r2dbc-mysql:0.8.1.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' From e37b63278b3f62f33104849ce2b5e19d9197772f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:55:36 +0100 Subject: [PATCH 16/23] Bump mysql-connector-java from 8.0.20 to 8.0.21 in /modules/jdbc-test (#3044) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.20 to 8.0.21. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.20...8.0.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/jdbc-test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle index f19970c9380..d8df69b094f 100644 --- a/modules/jdbc-test/build.gradle +++ b/modules/jdbc-test/build.gradle @@ -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' } From b20eca8e2cc65d7aa98fe58d55a6af3d2893fd16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 21:18:47 +0100 Subject: [PATCH 17/23] Bump aws-java-sdk-sqs from 1.11.812 to 1.11.831 in /modules/localstack (#3063) Bumps [aws-java-sdk-sqs](https://github.com/aws/aws-sdk-java) from 1.11.812 to 1.11.831. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.812...1.11.831) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/localstack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 3ce019b0549..3deb07dd139 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -5,7 +5,7 @@ dependencies { compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.816' 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.61' } From 2b37cab5cfd7f9949fdc0eb64060cc4d8cfd250e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 21:34:00 +0100 Subject: [PATCH 18/23] Bump aws-java-sdk-s3 from 1.11.816 to 1.11.831 in /modules/localstack (#3064) Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.816 to 1.11.831. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.816...1.11.831) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/localstack/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 3deb07dd139..ad5808a97b2 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -3,7 +3,7 @@ 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.831' testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807' From 65d35cea4bcb49736c3476d709f434a731c0a0de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 21:44:25 +0100 Subject: [PATCH 19/23] Bump r2dbc-mysql from 0.8.1.RELEASE to 0.8.2.RELEASE in /modules/mysql (#3046) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Richard North --- modules/mysql/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle index bf96ab89536..3badd2e18e1 100644 --- a/modules/mysql/build.gradle +++ b/modules/mysql/build.gradle @@ -7,7 +7,7 @@ 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.21' From aebc512d5659e98035290ba14df1f18ca4d94350 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 21:44:44 +0100 Subject: [PATCH 20/23] Bump mockito-core from 3.3.3 to 3.4.6 in /core (#3065) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.3 to 3.4.6. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.3.3...v3.4.6) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 98452944bd0..07cee319f5a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -204,7 +204,7 @@ dependencies { testCompile 'com.rabbitmq:amqp-client:5.9.0' testCompile 'org.mongodb:mongo-java-driver:3.12.5' - 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 From 003c741e40da037f1b9247ab7e37cbac87e6f371 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:15:04 +0100 Subject: [PATCH 21/23] Bump mongo-java-driver from 3.12.5 to 3.12.6 in /core (#3024) Bumps [mongo-java-driver](https://github.com/mongodb/mongo-java-driver) from 3.12.5 to 3.12.6. - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r3.12.5...r3.12.6) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 07cee319f5a..894990fe9a0 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -202,7 +202,7 @@ 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.4.6') { exclude(module: 'hamcrest-core') From 082b094d7edd0733c536f23208e55346d53abfb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:16:05 +0100 Subject: [PATCH 22/23] Bump aws-java-sdk-dynamodb from 1.11.816 to 1.11.827 in /modules/dynalite (#3027) Bumps [aws-java-sdk-dynamodb](https://github.com/aws/aws-sdk-java) from 1.11.816 to 1.11.827. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.816...1.11.827) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/dynalite/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle index b3919a3eaf3..d04705cb4d4 100644 --- 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' } From 0c69b448252ebd34e354289bcfb938767c7f7dd1 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Sat, 1 Aug 2020 16:44:34 +0200 Subject: [PATCH 23/23] Add some more logs to bash script used for DockerHealthcheckWaitStratgyTest (#2988) Co-authored-by: Sergei Egorov Co-authored-by: Richard North --- .../health-wait-strategy-dockerfile/write_file_and_loop.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index a102129394b..3a688ee3f4f 100755 --- 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